diff --git a/README.markdown b/README.markdown --- a/README.markdown +++ b/README.markdown @@ -2,18 +2,18 @@ regex is a regular expression toolkit for regex-base with: - * text-replacement operations with named captures; + * a text-replacement toolkit with type-safe text-replacement templates; * special datatypes for matches and captures; * compile-time checking of RE syntax; * a unified means of controlling case-sensitivity and multi-line options; * high-level AWK-like tools for building text processing apps; * the option of using match operators with reduced polymorphism on the - text and/or result types; + text and result types; * regular expression macros including: + a number of useful RE macros; + a test bench for testing and documenting new macro environments; * built-in support for the TDFA and PCRE backends; - * comprehensive documentation and copious examples. + * comprehensive documentation, tutorials and copious examples. See the [About page](http://about.regex.uk) for details. @@ -70,8 +70,12 @@     ☒  2017-03-29 v0.11.0.0 [Simplify the API](https://github.com/iconnect/regex/milestone/14) -    ☐  2017-03-31 v1.0.0.0 [First stable release](https://github.com/iconnect/regex/milestone/3) +    ☒  2017-03-30 v0.11.1.0 [Fix the Haddocks](https://github.com/iconnect/regex/milestone/15) +    ☒  2017-03-31 v0.12.0.0 [Move IsRegex into Text.RE](https://github.com/iconnect/regex/milestone/16) + +    ☐  2017-04-03 v1.0.0.0 [First stable release](https://github.com/iconnect/regex/milestone/3) +     ☐  2017-08-31 v2.0.0.0 [Fast text replacement with benchmarks](https://github.com/iconnect/regex/milestone/4) @@ -109,9 +113,9 @@ If you have any feedback or suggestion then please drop us a line. -    `t` [@hregex](https://twitter.com/hregex)\n -    `e` maintainers@regex.uk\n -    `w` http://issues.regex.uk + * `t` [@hregex](https://twitter.com/hregex)\n + * `e` maintainers@regex.uk\n + * `w` http://issues.regex.uk The [Contact page](http://contact.regex.uk) has more details. diff --git a/Text/RE/PCRE.hs b/Text/RE/PCRE.hs --- a/Text/RE/PCRE.hs +++ b/Text/RE/PCRE.hs @@ -39,14 +39,19 @@ -- $options , SimpleREOptions(..) -- * Compiling and Escaping REs + , SearchReplace(..) , compileRegex , compileRegexWith + , compileSearchReplace + , compileSearchReplaceWith , escape , escapeWith , escapeREString -- * The Classic rexex-base Match Operators , (=~) , (=~~) + -- * IsRegex + , IsRegex(..) -- * The Quasi Quoters and Minor Functions -- $re , module Text.RE.ZeInternals.PCRE @@ -63,17 +68,18 @@ import qualified Text.Regex.Base as B -import Text.RE -import Text.RE.ZeInternals.AddCaptureNames -import Text.RE.ZeInternals.SearchReplace.PCRE -import Text.RE.ZeInternals.PCRE import qualified Text.Regex.PCRE as PCRE import Text.RE.PCRE.ByteString() import Text.RE.PCRE.ByteString.Lazy() import Text.RE.PCRE.Sequence() import Text.RE.PCRE.String() -import Text.RE.IsRegex import Text.RE.REOptions +import Text.RE.ZeInternals.AddCaptureNames +import Text.RE.ZeInternals.SearchReplace.PCRE +import Text.RE.ZeInternals.PCRE +import Text.RE.ZeInternals.Types.IsRegex +import Text.RE.ZeInternals.Types.Match +import Text.RE.ZeInternals.Types.Matches -- | find all the matches in the argument text; e.g., to count the number diff --git a/Text/RE/PCRE/ByteString.hs b/Text/RE/PCRE/ByteString.hs --- a/Text/RE/PCRE/ByteString.hs +++ b/Text/RE/PCRE/ByteString.hs @@ -39,14 +39,19 @@ -- $options , SimpleREOptions(..) -- * Compiling and Escaping REs + , SearchReplace(..) , compileRegex , compileRegexWith + , compileSearchReplace + , compileSearchReplaceWith , escape , escapeWith , escapeREString -- * The Classic rexex-base Match Operators , (=~) , (=~~) + -- * IsRegex + , IsRegex(..) -- * The Quasi Quoters and Minor Functions -- $re , module Text.RE.ZeInternals.PCRE @@ -57,14 +62,13 @@ import Prelude.Compat import qualified Data.ByteString as B import Data.Typeable -import Text.Regex.Base -import Text.RE -import Text.RE.ZeInternals.AddCaptureNames -import Text.RE.ZeInternals.SearchReplace.PCRE.ByteString -import Text.RE.IsRegex import Text.RE.REOptions import Text.RE.Replace +import Text.RE.ZeInternals.AddCaptureNames +import Text.RE.ZeInternals.SearchReplace.PCRE.ByteString import Text.RE.ZeInternals.PCRE +import Text.RE.ZeInternals.Types.IsRegex +import Text.Regex.Base import qualified Text.Regex.PCRE as PCRE @@ -101,7 +105,7 @@ -- e.g., to prefix the first string of four hex digits in the imput text, -- if any, with @0x@: -- --- @(?=~\/ [ed|[0-9A-Fa-f]{4}\/\/\/0x$0|]) +-- @(?=~\/ [ed|[0-9A-Fa-f]{4}\/\/\/0x$0|])@ -- (?=~/) :: B.ByteString -> SearchReplace RE B.ByteString -> B.ByteString (?=~/) = flip searchReplaceFirst diff --git a/Text/RE/PCRE/ByteString/Lazy.hs b/Text/RE/PCRE/ByteString/Lazy.hs --- a/Text/RE/PCRE/ByteString/Lazy.hs +++ b/Text/RE/PCRE/ByteString/Lazy.hs @@ -39,14 +39,19 @@ -- $options , SimpleREOptions(..) -- * Compiling and Escaping REs + , SearchReplace(..) , compileRegex , compileRegexWith + , compileSearchReplace + , compileSearchReplaceWith , escape , escapeWith , escapeREString -- * The Classic rexex-base Match Operators , (=~) , (=~~) + -- * IsRegex + , IsRegex(..) -- * The Quasi Quoters and Minor Functions -- $re , module Text.RE.ZeInternals.PCRE @@ -57,14 +62,13 @@ import Prelude.Compat import qualified Data.ByteString.Lazy as LBS import Data.Typeable -import Text.Regex.Base -import Text.RE -import Text.RE.ZeInternals.AddCaptureNames -import Text.RE.ZeInternals.SearchReplace.PCRE.ByteString.Lazy -import Text.RE.IsRegex import Text.RE.REOptions import Text.RE.Replace +import Text.RE.ZeInternals.AddCaptureNames +import Text.RE.ZeInternals.SearchReplace.PCRE.ByteString.Lazy import Text.RE.ZeInternals.PCRE +import Text.RE.ZeInternals.Types.IsRegex +import Text.Regex.Base import qualified Text.Regex.PCRE as PCRE @@ -101,7 +105,7 @@ -- e.g., to prefix the first string of four hex digits in the imput text, -- if any, with @0x@: -- --- @(?=~\/ [ed|[0-9A-Fa-f]{4}\/\/\/0x$0|]) +-- @(?=~\/ [ed|[0-9A-Fa-f]{4}\/\/\/0x$0|])@ -- (?=~/) :: LBS.ByteString -> SearchReplace RE LBS.ByteString -> LBS.ByteString (?=~/) = flip searchReplaceFirst diff --git a/Text/RE/PCRE/Sequence.hs b/Text/RE/PCRE/Sequence.hs --- a/Text/RE/PCRE/Sequence.hs +++ b/Text/RE/PCRE/Sequence.hs @@ -39,14 +39,19 @@ -- $options , SimpleREOptions(..) -- * Compiling and Escaping REs + , SearchReplace(..) , compileRegex , compileRegexWith + , compileSearchReplace + , compileSearchReplaceWith , escape , escapeWith , escapeREString -- * The Classic rexex-base Match Operators , (=~) , (=~~) + -- * IsRegex + , IsRegex(..) -- * The Quasi Quoters and Minor Functions -- $re , module Text.RE.ZeInternals.PCRE @@ -57,14 +62,13 @@ import Prelude.Compat import qualified Data.Sequence as S import Data.Typeable -import Text.Regex.Base -import Text.RE -import Text.RE.ZeInternals.AddCaptureNames -import Text.RE.ZeInternals.SearchReplace.PCRE.Sequence -import Text.RE.IsRegex import Text.RE.REOptions import Text.RE.Replace +import Text.RE.ZeInternals.AddCaptureNames +import Text.RE.ZeInternals.SearchReplace.PCRE.Sequence import Text.RE.ZeInternals.PCRE +import Text.RE.ZeInternals.Types.IsRegex +import Text.Regex.Base import qualified Text.Regex.PCRE as PCRE @@ -101,7 +105,7 @@ -- e.g., to prefix the first string of four hex digits in the imput text, -- if any, with @0x@: -- --- @(?=~\/ [ed|[0-9A-Fa-f]{4}\/\/\/0x$0|]) +-- @(?=~\/ [ed|[0-9A-Fa-f]{4}\/\/\/0x$0|])@ -- (?=~/) :: (S.Seq Char) -> SearchReplace RE (S.Seq Char) -> (S.Seq Char) (?=~/) = flip searchReplaceFirst diff --git a/Text/RE/PCRE/String.hs b/Text/RE/PCRE/String.hs --- a/Text/RE/PCRE/String.hs +++ b/Text/RE/PCRE/String.hs @@ -39,14 +39,19 @@ -- $options , SimpleREOptions(..) -- * Compiling and Escaping REs + , SearchReplace(..) , compileRegex , compileRegexWith + , compileSearchReplace + , compileSearchReplaceWith , escape , escapeWith , escapeREString -- * The Classic rexex-base Match Operators , (=~) , (=~~) + -- * IsRegex + , IsRegex(..) -- * The Quasi Quoters and Minor Functions -- $re , module Text.RE.ZeInternals.PCRE @@ -57,14 +62,13 @@ import Prelude.Compat import Data.Typeable -import Text.Regex.Base -import Text.RE -import Text.RE.ZeInternals.AddCaptureNames -import Text.RE.ZeInternals.SearchReplace.PCRE.String -import Text.RE.IsRegex import Text.RE.REOptions import Text.RE.Replace +import Text.RE.ZeInternals.AddCaptureNames +import Text.RE.ZeInternals.SearchReplace.PCRE.String import Text.RE.ZeInternals.PCRE +import Text.RE.ZeInternals.Types.IsRegex +import Text.Regex.Base import qualified Text.Regex.PCRE as PCRE @@ -101,7 +105,7 @@ -- e.g., to prefix the first string of four hex digits in the imput text, -- if any, with @0x@: -- --- @(?=~\/ [ed|[0-9A-Fa-f]{4}\/\/\/0x$0|]) +-- @(?=~\/ [ed|[0-9A-Fa-f]{4}\/\/\/0x$0|])@ -- (?=~/) :: String -> SearchReplace RE String -> String (?=~/) = flip searchReplaceFirst diff --git a/Text/RE/ZeInternals/PCRE.hs b/Text/RE/ZeInternals/PCRE.hs --- a/Text/RE/ZeInternals/PCRE.hs +++ b/Text/RE/ZeInternals/PCRE.hs @@ -70,16 +70,16 @@ import Language.Haskell.TH import Language.Haskell.TH.Quote import Prelude.Compat -import Text.RE.IsRegex import Text.RE.REOptions import Text.RE.ZeInternals.EscapeREString import Text.RE.ZeInternals.NamedCaptures import Text.RE.ZeInternals.PreludeMacros -import Text.RE.ZeInternals.Replace import Text.RE.ZeInternals.QQ +import Text.RE.ZeInternals.Replace import Text.RE.ZeInternals.SearchReplace import Text.RE.ZeInternals.TestBench import Text.RE.ZeInternals.Types.CaptureID +import Text.RE.ZeInternals.Types.IsRegex import Text.Regex.PCRE diff --git a/Text/RE/ZeInternals/SearchReplace/PCREEdPrime.hs b/Text/RE/ZeInternals/SearchReplace/PCREEdPrime.hs --- a/Text/RE/ZeInternals/SearchReplace/PCREEdPrime.hs +++ b/Text/RE/ZeInternals/SearchReplace/PCREEdPrime.hs @@ -16,12 +16,12 @@ import Language.Haskell.TH import Language.Haskell.TH.Quote import Prelude.Compat +import Text.RE.REOptions +import Text.RE.Replace import Text.RE.ZeInternals.SearchReplace import Text.RE.ZeInternals.QQ import Text.RE.ZeInternals.PCRE -import Text.RE.IsRegex -import Text.RE.REOptions -import Text.RE.Replace +import Text.RE.ZeInternals.Types.IsRegex import Text.Regex.PCRE diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,5 +1,9 @@ -*-change-log-*- +0.12.0.0 Chris Dornan 2017-03-31 + * Add Text.RE.REOptions to RE.Summa (#103) + * Move IsRegex into Text.RE (#104) + 0.11.1.0 Chris Dornan 2017-03-30 * Cannot hide Text.RE.ZeInternals.SearchReaplace modules (#101) diff --git a/regex-with-pcre.cabal b/regex-with-pcre.cabal --- a/regex-with-pcre.cabal +++ b/regex-with-pcre.cabal @@ -1,5 +1,5 @@ Name: regex-with-pcre -Version: 0.11.1.0 +Version: 0.12.0.0 Synopsis: Toolkit for regex-base Description: A regular expression toolkit for regex-base with compile-time checking of RE syntax, data types for @@ -32,7 +32,7 @@ Source-Repository this Type: git Location: https://github.com/iconnect/regex.git - Tag: 0.11.1.0 + Tag: 0.12.0.0 @@ -87,7 +87,7 @@ -Wwarn Build-depends: - regex == 0.11.1.0 + regex == 0.12.0.0 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0