diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,6 +1,10 @@ -*-change-log-*- -1.0.1.0 Chris Dornan 2017-06-05 +1.0.1.1 Chris Dornan 2017-06-04 + * regex-pcre not working properly with UTF-8 text (#141) + * ZeInternals/SearchReplace (#140) + +1.0.1.0 Chris Dornan 2017-06-03 * Text.RE.PCRE.Text[.Lazy] (#58) * Update LSTHaskell versions (#136) * Add re-top example (#137) diff --git a/examples/re-tests.lhs b/examples/re-tests.lhs --- a/examples/re-tests.lhs +++ b/examples/re-tests.lhs @@ -28,6 +28,8 @@ import Data.Array import qualified Data.ByteString.Char8 as B import qualified Data.ByteString.Lazy.Char8 as LBS +import qualified Data.ByteString.Lazy.UTF8 as LBS +import qualified Data.ByteString.UTF8 as B import Data.Char import qualified Data.Foldable as F import qualified Data.HashMap.Strict as HM @@ -377,18 +379,33 @@ , testCase "TDFA.ed/LT" $ test LT.pack tdfa_eds , testCase "TDFA.ed/T(d)" $ test T.pack tdfa_eds' , testCase "PCRE.ed/LBS(d)" $ test LBS.pack pcre_eds' - , testg "TDFA.op/String" (T_ST.?=~/) (T_ST.*=~/) tdfa_sr - , testg "PCRE.op/String" (P_ST.?=~/) (P_ST.*=~/) pcre_sr - , testg "TDFA.op/B" (T_BS.?=~/) (T_BS.*=~/) tdfa_sr - , testg "PCRE.op/B" (P_BS.?=~/) (P_BS.*=~/) pcre_sr - , testg "TDFA.op/LBS" (TLBS.?=~/) (TLBS.*=~/) tdfa_sr - , testg "PCRE.op/LBS" (PLBS.?=~/) (PLBS.*=~/) pcre_sr - , testg "TDFA.op/T" (T_TX.?=~/) (T_TX.*=~/) tdfa_sr - , testg "PCRE.op/T" (P_TX.?=~/) (P_TX.*=~/) pcre_sr - , testg "TDFA.op/LT" (TLTX.?=~/) (TLTX.*=~/) tdfa_sr - , testg "PCRE.op/LT" (PLTX.?=~/) (PLTX.*=~/) pcre_sr - , testG "TDFA.op/S" (T_SQ.?=~/) (T_SQ.*=~/) tdfa_sr - , testG "PCRE.op/S" (P_SQ.?=~/) (P_SQ.*=~/) pcre_sr + , testg "TDFA.op" (T_ST.?=~/) (T_ST.*=~/) tdfa_sr + , testg "PCRE.op" (P_ST.?=~/) (P_ST.*=~/) pcre_sr + , testg "TDFA.op/String" (T_ST.?=~/) (T_ST.*=~/) tdfa_sr_str + , testg "PCRE.op/String" (P_ST.?=~/) (P_ST.*=~/) pcre_sr_str + , testg "TDFA.op/B" (T_BS.?=~/) (T_BS.*=~/) tdfa_sr_b + , testg "PCRE.op/B" (P_BS.?=~/) (P_BS.*=~/) pcre_sr_b + , testg "TDFA.op/LBS" (TLBS.?=~/) (TLBS.*=~/) tdfa_sr_lbs + , testg "PCRE.op/LBS" (PLBS.?=~/) (PLBS.*=~/) pcre_sr_lbs + , testg "TDFA.op/T" (T_TX.?=~/) (T_TX.*=~/) tdfa_sr_t + , testg "PCRE.op/T" (P_TX.?=~/) (P_TX.*=~/) pcre_sr_t + , testg "TDFA.op/LT" (TLTX.?=~/) (TLTX.*=~/) tdfa_sr_lt + , testg "PCRE.op/LT" (PLTX.?=~/) (PLTX.*=~/) pcre_sr_lt + , testG "TDFA.op/S" (T_SQ.?=~/) (T_SQ.*=~/) tdfa_sr_s + , testG "PCRE.op/S" (P_SQ.?=~/) (P_SQ.*=~/) pcre_sr_s + , testu "PCRE.U/String" id (P_ST.*=~/) [P_ST.ed|scientist///boffin|] (P_ST.*=~) [P_ST.re|λ-|] + , testu "PCRE.U/B" B.fromString (P_BS.*=~/) [P_BS.ed|scientist///boffin|] (P_BS.*=~) [P_BS.re|λ-|] + , testu "PCRE.U/LBS" LBS.fromString (PLBS.*=~/) [PLBS.ed|scientist///boffin|] (PLBS.*=~) [PLBS.re|λ-|] + , testu "PCRE.U/T" T.pack (P_TX.*=~/) [P_TX.ed|scientist///boffin|] (P_TX.*=~) [P_TX.re|λ-|] + , testu "PCRE.U/LT" LT.pack (PLTX.*=~/) [PLTX.ed|scientist///boffin|] (PLTX.*=~) [PLTX.re|λ-|] + , testu "PCRE.U/S" S.fromList (P_SQ.*=~/) [P_SQ.ed|scientist///boffin|] (P_SQ.*=~) [P_SQ.re|burble|] + , testu "TDFA.U/String" id (T_ST.*=~/) [T_ST.ed|scientist///boffin|] (T_ST.*=~) [T_ST.re|λ-|] + , testu "TDFA.U/B" B.fromString (T_BS.*=~/) [T_BS.ed|scientist///boffin|] (T_BS.*=~) [T_BS.re|burble|] + , testu "TDFA.U/LBS" LBS.fromString (TLBS.*=~/) [TLBS.ed|scientist///boffin|] (TLBS.*=~) [TLBS.re|burble|] + , testu "TDFA.U/T" T.pack (T_TX.*=~/) [T_TX.ed|scientist///boffin|] (T_TX.*=~) [T_TX.re|λ-|] + , testu "TDFA.U/LT" LT.pack (TLTX.*=~/) [TLTX.ed|scientist///boffin|] (TLTX.*=~) [TLTX.re|λ-|] + , testu "TDFA.U/S" S.fromList (T_SQ.*=~/) [T_SQ.ed|scientist///boffin|] (T_SQ.*=~) [T_SQ.re|λ-|] + ] where test :: IsRegex re a => (String->a) -> Edits Identity re a -> Assertion @@ -404,39 +421,84 @@ , testCase "*=~/" $ S.fromList rsm @=? S.fromList inp `opm` sr ] + testu lab inj op sr qop rex = testGroup lab + [ testCase "*=~/" $ inj unr @=? inj uni `op` sr + , testCase "*=~" $ 1 @=? countMatches (inj uni `qop` rex) + ] + inp, rs1, rsm :: IsString a => a inp = "16/03/2017 01/01/2000\n" rs1 = "2017-03-16 01/01/2000\n" rsm = "2017-03-16 2000-01-01\n" - tdfa_eds :: IsRegex TDFA.RE a => Edits Identity TDFA.RE a - tdfa_eds = Select [Template tdfa_sr] + uni, unr :: String + uni = "\x2070E-\8364-\955-scientist-burble" + unr = "\x2070E-\8364-\955-boffin-burble" - pcre_eds :: IsRegex PCRE.RE a => Edits Identity PCRE.RE a - pcre_eds = Select [Template pcre_sr] + tdfa_eds :: IsRegex TDFA.RE a => Edits Identity TDFA.RE a + tdfa_eds = Select [Template tdfa_sr] - tdfa_sr :: IsRegex TDFA.RE a => SearchReplace TDFA.RE a - tdfa_sr = [TDFA.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] + pcre_eds :: IsRegex PCRE.RE a => Edits Identity PCRE.RE a + pcre_eds = Select [Template pcre_sr] - pcre_sr :: IsRegex PCRE.RE a => SearchReplace PCRE.RE a - pcre_sr = [PCRE.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] + tdfa_sr :: IsRegex TDFA.RE a => SearchReplace TDFA.RE a + tdfa_sr = [TDFA.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] - tdfa_eds' :: IsRegex TDFA.RE a => Edits Identity TDFA.RE a - tdfa_eds' = Select [Template $ tdfa_csr "${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})" "${y}-${m}-${d}"] + pcre_sr :: IsRegex PCRE.RE a => SearchReplace PCRE.RE a + pcre_sr = [PCRE.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] - pcre_eds' :: IsRegex PCRE.RE a => Edits Identity PCRE.RE a - pcre_eds' = Select [Template $ pcre_csr "${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})" "${y}-${m}-${d}"] + tdfa_sr_str :: SearchReplace TDFA.RE String + tdfa_sr_str = [T_ST.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] - tdfa_csr :: IsRegex TDFA.RE s - => String - -> String - -> SearchReplace TDFA.RE s + pcre_sr_str :: SearchReplace PCRE.RE String + pcre_sr_str = [P_ST.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] + + tdfa_sr_b :: SearchReplace TDFA.RE B.ByteString + tdfa_sr_b = [T_BS.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] + + pcre_sr_b :: SearchReplace PCRE.RE B.ByteString + pcre_sr_b = [P_BS.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] + + tdfa_sr_lbs :: SearchReplace TDFA.RE LBS.ByteString + tdfa_sr_lbs = [TLBS.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] + + pcre_sr_lbs :: SearchReplace PCRE.RE LBS.ByteString + pcre_sr_lbs = [PLBS.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] + + tdfa_sr_t :: SearchReplace TDFA.RE T.Text + tdfa_sr_t = [T_TX.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] + + pcre_sr_t :: SearchReplace PCRE.RE T.Text + pcre_sr_t = [P_TX.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] + + tdfa_sr_lt :: SearchReplace TDFA.RE LT.Text + tdfa_sr_lt = [TLTX.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] + + pcre_sr_lt :: SearchReplace PCRE.RE LT.Text + pcre_sr_lt = [PLTX.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] + + tdfa_sr_s :: SearchReplace TDFA.RE (S.Seq Char) + tdfa_sr_s = [T_SQ.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] + + pcre_sr_s :: SearchReplace PCRE.RE (S.Seq Char) + pcre_sr_s = [P_SQ.ed|${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})///${y}-${m}-${d}|] + + tdfa_eds' :: IsRegex TDFA.RE a => Edits Identity TDFA.RE a + tdfa_eds' = Select [Template $ tdfa_csr "${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})" "${y}-${m}-${d}"] + + pcre_eds' :: IsRegex PCRE.RE a => Edits Identity PCRE.RE a + pcre_eds' = Select [Template $ pcre_csr "${d}([0-9]{2})/${m}([0-9]{2})/${y}([0-9]{4})" "${y}-${m}-${d}"] + + tdfa_csr :: IsRegex TDFA.RE s + => String + -> String + -> SearchReplace TDFA.RE s tdfa_csr re_s = either error id . TDFA.compileSearchReplace re_s - pcre_csr :: IsRegex PCRE.RE s - => String - -> String - -> SearchReplace PCRE.RE s + pcre_csr :: IsRegex PCRE.RE s + => String + -> String + -> SearchReplace PCRE.RE s pcre_csr re_s = either error id . PCRE.compileSearchReplace re_s \end{code} diff --git a/lib/cabal-masters/constraints-incl.cabal b/lib/cabal-masters/constraints-incl.cabal --- a/lib/cabal-masters/constraints-incl.cabal +++ b/lib/cabal-masters/constraints-incl.cabal @@ -29,3 +29,4 @@ %- time-locale-compat == 0.1.* %- transformers >= 0.2.2 && < 0.6 %- unordered-containers == 0.2.* +%- utf8-string == 1.0.* diff --git a/lib/cabal-masters/executables-incl.cabal b/lib/cabal-masters/executables-incl.cabal --- a/lib/cabal-masters/executables-incl.cabal +++ b/lib/cabal-masters/executables-incl.cabal @@ -66,7 +66,7 @@ Other-Modules: TestKit -%build-depends-prog regex regex-with-pcre array base base-compat bytestring containers directory filepath heredoc regex-base regex-tdfa regex-tdfa-text regex-pcre-builtin shelly smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text unordered-containers +%build-depends-prog regex regex-with-pcre array base base-compat bytestring containers directory filepath heredoc regex-base regex-tdfa regex-tdfa-text regex-pcre-builtin shelly smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text unordered-containers utf8-string %test-exe re-top Hs-Source-Dirs: examples diff --git a/lib/cabal-masters/mega-regex.cabal b/lib/cabal-masters/mega-regex.cabal --- a/lib/cabal-masters/mega-regex.cabal +++ b/lib/cabal-masters/mega-regex.cabal @@ -38,7 +38,7 @@ %include "lib/cabal-masters/library-incl.cabal" -%build-depends-lib array bytestring base base-compat containers hashable regex-base regex-tdfa regex-tdfa-text regex-pcre-builtin regex-pcre-text template-haskell text time time-locale-compat transformers unordered-containers +%build-depends-lib array bytestring base base-compat containers hashable regex-base regex-tdfa regex-tdfa-text regex-pcre-builtin regex-pcre-text template-haskell text time time-locale-compat transformers unordered-containers utf8-string %include "lib/cabal-masters/executables-incl.cabal" diff --git a/lib/cabal-masters/regex.cabal b/lib/cabal-masters/regex.cabal --- a/lib/cabal-masters/regex.cabal +++ b/lib/cabal-masters/regex.cabal @@ -3,6 +3,6 @@ %include "lib/cabal-masters/constraints-incl.cabal" %include "lib/cabal-masters/library-incl.cabal" exclude "PCRE" -%build-depends-lib array base base-compat bytestring containers hashable regex-base regex-tdfa regex-tdfa-text template-haskell text time time-locale-compat transformers unordered-containers +%build-depends-lib array base base-compat bytestring containers hashable regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text time time-locale-compat transformers unordered-containers utf8-string -- Generated with re-gen-cabals diff --git a/lib/mega-regex.cabal b/lib/mega-regex.cabal --- a/lib/mega-regex.cabal +++ b/lib/mega-regex.cabal @@ -1,5 +1,5 @@ Name: regex -Version: 1.0.1.0 +Version: 1.0.1.1 Synopsis: Toolkit for regex-base Description: A regular expression toolkit for regex-base with compile-time checking of RE syntax, data types for @@ -68,7 +68,7 @@ Source-Repository this Type: git Location: https://github.com/iconnect/regex.git - Tag: 1.0.1.0 + Tag: 1.0.1.1 @@ -192,6 +192,7 @@ , time-locale-compat == 0.1.* , transformers >= 0.2.2 && < 0.6 , unordered-containers == 0.2.* + , utf8-string == 1.0.* Executable re-gen-cabals @@ -210,7 +211,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -240,7 +241,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -270,7 +271,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -299,7 +300,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -328,7 +329,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -354,7 +355,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -380,7 +381,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -414,7 +415,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -448,7 +449,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -477,7 +478,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -506,7 +507,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -533,7 +534,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -560,7 +561,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -581,6 +582,7 @@ , template-haskell >= 2.7 && < 2.12 , text == 1.2.* , unordered-containers == 0.2.* + , utf8-string == 1.0.* Test-Suite re-tests-test @@ -600,7 +602,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -621,6 +623,7 @@ , template-haskell >= 2.7 && < 2.12 , text == 1.2.* , unordered-containers == 0.2.* + , utf8-string == 1.0.* @@ -640,7 +643,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , blaze-html >= 0.8.1.0 @@ -673,7 +676,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , blaze-html >= 0.8.1.0 @@ -707,7 +710,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -751,7 +754,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -797,7 +800,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -841,7 +844,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -885,7 +888,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -929,7 +932,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -973,7 +976,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -1017,7 +1020,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -1061,7 +1064,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -1105,7 +1108,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -1150,7 +1153,7 @@ -Werror Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 diff --git a/lib/version.txt b/lib/version.txt --- a/lib/version.txt +++ b/lib/version.txt @@ -1,1 +1,1 @@ -1.0.1.0 +1.0.1.1 diff --git a/regex-examples.cabal b/regex-examples.cabal --- a/regex-examples.cabal +++ b/regex-examples.cabal @@ -1,5 +1,5 @@ Name: regex-examples -Version: 1.0.1.0 +Version: 1.0.1.1 Synopsis: Tutorial, tests and example programs for regex Description: Tutorial, tests and example programs for regex, a Regular Expression Toolkit for regex-base with @@ -68,7 +68,7 @@ Source-Repository this Type: git Location: https://github.com/iconnect/regex.git - Tag: 1.0.1.0 + Tag: 1.0.1.1 Executable re-gen-cabals @@ -87,7 +87,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -117,7 +117,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -147,7 +147,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -176,7 +176,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -205,7 +205,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -231,7 +231,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -257,8 +257,8 @@ -Wwarn Build-depends: - regex == 1.0.1.0 - , regex-with-pcre == 1.0.1.0 + regex == 1.0.1.1 + , regex-with-pcre == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -292,8 +292,8 @@ -Wwarn Build-depends: - regex == 1.0.1.0 - , regex-with-pcre == 1.0.1.0 + regex == 1.0.1.1 + , regex-with-pcre == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -327,7 +327,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -356,7 +356,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -385,7 +385,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -412,7 +412,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -439,8 +439,8 @@ -Wwarn Build-depends: - regex == 1.0.1.0 - , regex-with-pcre == 1.0.1.0 + regex == 1.0.1.1 + , regex-with-pcre == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -461,6 +461,7 @@ , template-haskell >= 2.7 && < 2.12 , text == 1.2.* , unordered-containers == 0.2.* + , utf8-string == 1.0.* Test-Suite re-tests-test @@ -480,8 +481,8 @@ -Wwarn Build-depends: - regex == 1.0.1.0 - , regex-with-pcre == 1.0.1.0 + regex == 1.0.1.1 + , regex-with-pcre == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -502,6 +503,7 @@ , template-haskell >= 2.7 && < 2.12 , text == 1.2.* , unordered-containers == 0.2.* + , utf8-string == 1.0.* @@ -521,7 +523,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , blaze-html >= 0.8.1.0 @@ -554,7 +556,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , blaze-html >= 0.8.1.0 @@ -588,7 +590,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -632,7 +634,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -678,7 +680,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -722,8 +724,8 @@ -Wwarn Build-depends: - regex == 1.0.1.0 - , regex-with-pcre == 1.0.1.0 + regex == 1.0.1.1 + , regex-with-pcre == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -767,8 +769,8 @@ -Wwarn Build-depends: - regex == 1.0.1.0 - , regex-with-pcre == 1.0.1.0 + regex == 1.0.1.1 + , regex-with-pcre == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -812,7 +814,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -856,7 +858,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -900,7 +902,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -944,7 +946,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -988,7 +990,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -1033,7 +1035,7 @@ -Wwarn Build-depends: - regex == 1.0.1.0 + regex == 1.0.1.1 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10