diff --git a/Text/RE/PCRE.hs b/Text/RE/PCRE.hs --- a/Text/RE/PCRE.hs +++ b/Text/RE/PCRE.hs @@ -194,7 +194,7 @@ -- This module provides access to the back end through polymorphic functions -- that operate over all of the String\/Text\/ByteString types supported by the -- back end. The module also provides all of the specialised back-end functionality --- that will not be needed by most regex clientts. If you don't need this generality +-- that will not be needed by most regex clients. If you don't need this generality -- then you might want to consider using one of the simpler modules that have been -- specialised for each of these types: -- @@ -221,7 +221,7 @@ -- options dynamically, use the @[re_| ... |]@ and @[ed_| ... \/\/\/ ... |]@ -- quasi quoters, which generate functions that take an 'IsOption' option -- (e.g., a 'SimpleReOptions' value) and yields a 'RE' or 'SearchReplace' --- as apropriate. For example if you have a 'SimpleReOptions' value in +-- as appropriate. For example if you have a 'SimpleReOptions' value in -- @sro@ then -- -- @(?=~/ [ed_|foo$\/\/\/bar|] sro)@ @@ -230,7 +230,7 @@ -- on specifying RE options see "Text.RE.REOptions". -- $re --- The @[re|.*|]@ quasi quoters, with variants for specifing different +-- The @[re|.*|]@ quasi quoters, with variants for specifying different -- options to the RE compiler (see "Text.RE.REOptions"), and the -- specialised back-end types and functions. @@ -242,13 +242,13 @@ -- represents a @SearchReplace@ that will convert a YYYY-MM-DD format date -- into a DD\/MM\/YYYY format date. -- --- The only difference betweem these quasi quoters is the RE options that are set, +-- The only difference between these quasi quoters is the RE options that are set, -- using the same conventions as the @[re| ... |]@ quasi quoters. -- -- $isregex --- The 'IsRegex' class is used to abstact over the different regex back ends and +-- The 'IsRegex' class is used to abstract over the different regex back ends and -- the text types they work with -- see "Text.RE.Tools.IsRegex" for details. -- $instances --- These module exportss merely provide the 'IsRegex' instances. +-- These module exports merely provide the 'IsRegex' instances. 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 @@ -186,7 +186,7 @@ -- options dynamically, use the @[re_| ... |]@ and @[ed_| ... \/\/\/ ... |]@ -- quasi quoters, which generate functions that take an 'IsOption' option -- (e.g., a 'SimpleReOptions' value) and yields a 'RE' or 'SearchReplace' --- as apropriate. For example if you have a 'SimpleReOptions' value in +-- as appropriate. For example if you have a 'SimpleReOptions' value in -- @sro@ then -- -- @(?=~/ [ed_|foo$\/\/\/bar|] sro)@ @@ -195,12 +195,12 @@ -- on specifying RE options see "Text.RE.REOptions". -- $re --- The @[re|.*|]@ quasi quoters, with variants for specifing different +-- The @[re|.*|]@ quasi quoters, with variants for specifying different -- options to the RE compiler (see "Text.RE.REOptions"), and the -- specialised back-end types and functions. -- $ed --- The @[ed|.*\/\/\/foo|]@ quasi quoters, with variants for specifing different +-- The @[ed|.*\/\/\/foo|]@ quasi quoters, with variants for specifying different -- options to the RE compiler (see "Text.RE.REOptions"). -- $ed @@ -211,9 +211,9 @@ -- represents a @SearchReplace@ that will convert a YYYY-MM-DD format date -- into a DD\/MM\/YYYY format date. -- --- The only difference betweem these quasi quoters is the RE options that are set, +-- The only difference between these quasi quoters is the RE options that are set, -- using the same conventions as the @[re| ... |]@ quasi quoters. -- $isregex --- The 'IsRegex' class is used to abstact over the different regex back ends and +-- The 'IsRegex' class is used to abstract over the different regex back ends and -- the text types they work with -- see "Text.RE.Tools.IsRegex" for details. 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 @@ -186,7 +186,7 @@ -- options dynamically, use the @[re_| ... |]@ and @[ed_| ... \/\/\/ ... |]@ -- quasi quoters, which generate functions that take an 'IsOption' option -- (e.g., a 'SimpleReOptions' value) and yields a 'RE' or 'SearchReplace' --- as apropriate. For example if you have a 'SimpleReOptions' value in +-- as appropriate. For example if you have a 'SimpleReOptions' value in -- @sro@ then -- -- @(?=~/ [ed_|foo$\/\/\/bar|] sro)@ @@ -195,12 +195,12 @@ -- on specifying RE options see "Text.RE.REOptions". -- $re --- The @[re|.*|]@ quasi quoters, with variants for specifing different +-- The @[re|.*|]@ quasi quoters, with variants for specifying different -- options to the RE compiler (see "Text.RE.REOptions"), and the -- specialised back-end types and functions. -- $ed --- The @[ed|.*\/\/\/foo|]@ quasi quoters, with variants for specifing different +-- The @[ed|.*\/\/\/foo|]@ quasi quoters, with variants for specifying different -- options to the RE compiler (see "Text.RE.REOptions"). -- $ed @@ -211,9 +211,9 @@ -- represents a @SearchReplace@ that will convert a YYYY-MM-DD format date -- into a DD\/MM\/YYYY format date. -- --- The only difference betweem these quasi quoters is the RE options that are set, +-- The only difference between these quasi quoters is the RE options that are set, -- using the same conventions as the @[re| ... |]@ quasi quoters. -- $isregex --- The 'IsRegex' class is used to abstact over the different regex back ends and +-- The 'IsRegex' class is used to abstract over the different regex back ends and -- the text types they work with -- see "Text.RE.Tools.IsRegex" for details. 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 @@ -186,7 +186,7 @@ -- options dynamically, use the @[re_| ... |]@ and @[ed_| ... \/\/\/ ... |]@ -- quasi quoters, which generate functions that take an 'IsOption' option -- (e.g., a 'SimpleReOptions' value) and yields a 'RE' or 'SearchReplace' --- as apropriate. For example if you have a 'SimpleReOptions' value in +-- as appropriate. For example if you have a 'SimpleReOptions' value in -- @sro@ then -- -- @(?=~/ [ed_|foo$\/\/\/bar|] sro)@ @@ -195,12 +195,12 @@ -- on specifying RE options see "Text.RE.REOptions". -- $re --- The @[re|.*|]@ quasi quoters, with variants for specifing different +-- The @[re|.*|]@ quasi quoters, with variants for specifying different -- options to the RE compiler (see "Text.RE.REOptions"), and the -- specialised back-end types and functions. -- $ed --- The @[ed|.*\/\/\/foo|]@ quasi quoters, with variants for specifing different +-- The @[ed|.*\/\/\/foo|]@ quasi quoters, with variants for specifying different -- options to the RE compiler (see "Text.RE.REOptions"). -- $ed @@ -211,9 +211,9 @@ -- represents a @SearchReplace@ that will convert a YYYY-MM-DD format date -- into a DD\/MM\/YYYY format date. -- --- The only difference betweem these quasi quoters is the RE options that are set, +-- The only difference between these quasi quoters is the RE options that are set, -- using the same conventions as the @[re| ... |]@ quasi quoters. -- $isregex --- The 'IsRegex' class is used to abstact over the different regex back ends and +-- The 'IsRegex' class is used to abstract over the different regex back ends and -- the text types they work with -- see "Text.RE.Tools.IsRegex" for details. 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 @@ -186,7 +186,7 @@ -- options dynamically, use the @[re_| ... |]@ and @[ed_| ... \/\/\/ ... |]@ -- quasi quoters, which generate functions that take an 'IsOption' option -- (e.g., a 'SimpleReOptions' value) and yields a 'RE' or 'SearchReplace' --- as apropriate. For example if you have a 'SimpleReOptions' value in +-- as appropriate. For example if you have a 'SimpleReOptions' value in -- @sro@ then -- -- @(?=~/ [ed_|foo$\/\/\/bar|] sro)@ @@ -195,12 +195,12 @@ -- on specifying RE options see "Text.RE.REOptions". -- $re --- The @[re|.*|]@ quasi quoters, with variants for specifing different +-- The @[re|.*|]@ quasi quoters, with variants for specifying different -- options to the RE compiler (see "Text.RE.REOptions"), and the -- specialised back-end types and functions. -- $ed --- The @[ed|.*\/\/\/foo|]@ quasi quoters, with variants for specifing different +-- The @[ed|.*\/\/\/foo|]@ quasi quoters, with variants for specifying different -- options to the RE compiler (see "Text.RE.REOptions"). -- $ed @@ -211,9 +211,9 @@ -- represents a @SearchReplace@ that will convert a YYYY-MM-DD format date -- into a DD\/MM\/YYYY format date. -- --- The only difference betweem these quasi quoters is the RE options that are set, +-- The only difference between these quasi quoters is the RE options that are set, -- using the same conventions as the @[re| ... |]@ quasi quoters. -- $isregex --- The 'IsRegex' class is used to abstact over the different regex back ends and +-- The 'IsRegex' class is used to abstract over the different regex back ends and -- the text types they work with -- see "Text.RE.Tools.IsRegex" for details. diff --git a/Text/RE/PCRE/Text.hs b/Text/RE/PCRE/Text.hs --- a/Text/RE/PCRE/Text.hs +++ b/Text/RE/PCRE/Text.hs @@ -186,7 +186,7 @@ -- options dynamically, use the @[re_| ... |]@ and @[ed_| ... \/\/\/ ... |]@ -- quasi quoters, which generate functions that take an 'IsOption' option -- (e.g., a 'SimpleReOptions' value) and yields a 'RE' or 'SearchReplace' --- as apropriate. For example if you have a 'SimpleReOptions' value in +-- as appropriate. For example if you have a 'SimpleReOptions' value in -- @sro@ then -- -- @(?=~/ [ed_|foo$\/\/\/bar|] sro)@ @@ -195,12 +195,12 @@ -- on specifying RE options see "Text.RE.REOptions". -- $re --- The @[re|.*|]@ quasi quoters, with variants for specifing different +-- The @[re|.*|]@ quasi quoters, with variants for specifying different -- options to the RE compiler (see "Text.RE.REOptions"), and the -- specialised back-end types and functions. -- $ed --- The @[ed|.*\/\/\/foo|]@ quasi quoters, with variants for specifing different +-- The @[ed|.*\/\/\/foo|]@ quasi quoters, with variants for specifying different -- options to the RE compiler (see "Text.RE.REOptions"). -- $ed @@ -211,9 +211,9 @@ -- represents a @SearchReplace@ that will convert a YYYY-MM-DD format date -- into a DD\/MM\/YYYY format date. -- --- The only difference betweem these quasi quoters is the RE options that are set, +-- The only difference between these quasi quoters is the RE options that are set, -- using the same conventions as the @[re| ... |]@ quasi quoters. -- $isregex --- The 'IsRegex' class is used to abstact over the different regex back ends and +-- The 'IsRegex' class is used to abstract over the different regex back ends and -- the text types they work with -- see "Text.RE.Tools.IsRegex" for details. diff --git a/Text/RE/PCRE/Text/Lazy.hs b/Text/RE/PCRE/Text/Lazy.hs --- a/Text/RE/PCRE/Text/Lazy.hs +++ b/Text/RE/PCRE/Text/Lazy.hs @@ -186,7 +186,7 @@ -- options dynamically, use the @[re_| ... |]@ and @[ed_| ... \/\/\/ ... |]@ -- quasi quoters, which generate functions that take an 'IsOption' option -- (e.g., a 'SimpleReOptions' value) and yields a 'RE' or 'SearchReplace' --- as apropriate. For example if you have a 'SimpleReOptions' value in +-- as appropriate. For example if you have a 'SimpleReOptions' value in -- @sro@ then -- -- @(?=~/ [ed_|foo$\/\/\/bar|] sro)@ @@ -195,12 +195,12 @@ -- on specifying RE options see "Text.RE.REOptions". -- $re --- The @[re|.*|]@ quasi quoters, with variants for specifing different +-- The @[re|.*|]@ quasi quoters, with variants for specifying different -- options to the RE compiler (see "Text.RE.REOptions"), and the -- specialised back-end types and functions. -- $ed --- The @[ed|.*\/\/\/foo|]@ quasi quoters, with variants for specifing different +-- The @[ed|.*\/\/\/foo|]@ quasi quoters, with variants for specifying different -- options to the RE compiler (see "Text.RE.REOptions"). -- $ed @@ -211,9 +211,9 @@ -- represents a @SearchReplace@ that will convert a YYYY-MM-DD format date -- into a DD\/MM\/YYYY format date. -- --- The only difference betweem these quasi quoters is the RE options that are set, +-- The only difference between these quasi quoters is the RE options that are set, -- using the same conventions as the @[re| ... |]@ quasi quoters. -- $isregex --- The 'IsRegex' class is used to abstact over the different regex back ends and +-- The 'IsRegex' class is used to abstract over the different regex back ends and -- the text types they work with -- see "Text.RE.Tools.IsRegex" for details. 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 @@ -305,7 +305,7 @@ preludeSources :: String preludeSources = preludeMacroSources regexType --- | the prolude source of a given macro in the standard environment +-- | the prelude source of a given macro in the standard environment preludeSource :: PreludeMacro -> String preludeSource = preludeMacroSource regexType @@ -358,7 +358,7 @@ -- @countMatches $ s *=~ [re_|[0-9a-f]+|] MultilineInsensitive@ -- -- counts the number of hexadecimal digit strings in 's', allowing --- upper- or lower-case hex didgits. +-- upper- or lower-case hex digits. re_ :: QuasiQuoter re_ = re' Nothing diff --git a/Text/RE/ZeInternals/SearchReplace/PCRE/ByteString.hs b/Text/RE/ZeInternals/SearchReplace/PCRE/ByteString.hs --- a/Text/RE/ZeInternals/SearchReplace/PCRE/ByteString.hs +++ b/Text/RE/ZeInternals/SearchReplace/PCRE/ByteString.hs @@ -71,7 +71,7 @@ -- @s *=~/ [ed_|${hex}([0-9a-f]+)\/\/\/0x${hex}|] MultilineInsensitive@ -- -- prefixes the hexadecimal digit strings in s with @0x@, allowing for --- upper- or lower-case hex didgits (which is entirely equivalent +-- upper- or lower-case hex digits (which is entirely equivalent -- in this example to just using @[edMultilineInsensitive|[0-9a-f]+|]@). ed_ :: QuasiQuoter ed_ = ed' fn_cast Nothing diff --git a/Text/RE/ZeInternals/SearchReplace/PCRE/ByteString/Lazy.hs b/Text/RE/ZeInternals/SearchReplace/PCRE/ByteString/Lazy.hs --- a/Text/RE/ZeInternals/SearchReplace/PCRE/ByteString/Lazy.hs +++ b/Text/RE/ZeInternals/SearchReplace/PCRE/ByteString/Lazy.hs @@ -71,7 +71,7 @@ -- @s *=~/ [ed_|${hex}([0-9a-f]+)\/\/\/0x${hex}|] MultilineInsensitive@ -- -- prefixes the hexadecimal digit strings in s with @0x@, allowing for --- upper- or lower-case hex didgits (which is entirely equivalent +-- upper- or lower-case hex digits (which is entirely equivalent -- in this example to just using @[edMultilineInsensitive|[0-9a-f]+|]@). ed_ :: QuasiQuoter ed_ = ed' fn_cast Nothing diff --git a/Text/RE/ZeInternals/SearchReplace/PCRE/Sequence.hs b/Text/RE/ZeInternals/SearchReplace/PCRE/Sequence.hs --- a/Text/RE/ZeInternals/SearchReplace/PCRE/Sequence.hs +++ b/Text/RE/ZeInternals/SearchReplace/PCRE/Sequence.hs @@ -71,7 +71,7 @@ -- @s *=~/ [ed_|${hex}([0-9a-f]+)\/\/\/0x${hex}|] MultilineInsensitive@ -- -- prefixes the hexadecimal digit strings in s with @0x@, allowing for --- upper- or lower-case hex didgits (which is entirely equivalent +-- upper- or lower-case hex digits (which is entirely equivalent -- in this example to just using @[edMultilineInsensitive|[0-9a-f]+|]@). ed_ :: QuasiQuoter ed_ = ed' fn_cast Nothing diff --git a/Text/RE/ZeInternals/SearchReplace/PCRE/String.hs b/Text/RE/ZeInternals/SearchReplace/PCRE/String.hs --- a/Text/RE/ZeInternals/SearchReplace/PCRE/String.hs +++ b/Text/RE/ZeInternals/SearchReplace/PCRE/String.hs @@ -71,7 +71,7 @@ -- @s *=~/ [ed_|${hex}([0-9a-f]+)\/\/\/0x${hex}|] MultilineInsensitive@ -- -- prefixes the hexadecimal digit strings in s with @0x@, allowing for --- upper- or lower-case hex didgits (which is entirely equivalent +-- upper- or lower-case hex digits (which is entirely equivalent -- in this example to just using @[edMultilineInsensitive|[0-9a-f]+|]@). ed_ :: QuasiQuoter ed_ = ed' fn_cast Nothing diff --git a/Text/RE/ZeInternals/SearchReplace/PCRE/Text.hs b/Text/RE/ZeInternals/SearchReplace/PCRE/Text.hs --- a/Text/RE/ZeInternals/SearchReplace/PCRE/Text.hs +++ b/Text/RE/ZeInternals/SearchReplace/PCRE/Text.hs @@ -71,7 +71,7 @@ -- @s *=~/ [ed_|${hex}([0-9a-f]+)\/\/\/0x${hex}|] MultilineInsensitive@ -- -- prefixes the hexadecimal digit strings in s with @0x@, allowing for --- upper- or lower-case hex didgits (which is entirely equivalent +-- upper- or lower-case hex digits (which is entirely equivalent -- in this example to just using @[edMultilineInsensitive|[0-9a-f]+|]@). ed_ :: QuasiQuoter ed_ = ed' fn_cast Nothing diff --git a/Text/RE/ZeInternals/SearchReplace/PCRE/Text/Lazy.hs b/Text/RE/ZeInternals/SearchReplace/PCRE/Text/Lazy.hs --- a/Text/RE/ZeInternals/SearchReplace/PCRE/Text/Lazy.hs +++ b/Text/RE/ZeInternals/SearchReplace/PCRE/Text/Lazy.hs @@ -71,7 +71,7 @@ -- @s *=~/ [ed_|${hex}([0-9a-f]+)\/\/\/0x${hex}|] MultilineInsensitive@ -- -- prefixes the hexadecimal digit strings in s with @0x@, allowing for --- upper- or lower-case hex didgits (which is entirely equivalent +-- upper- or lower-case hex digits (which is entirely equivalent -- in this example to just using @[edMultilineInsensitive|[0-9a-f]+|]@). ed_ :: QuasiQuoter ed_ = ed' fn_cast Nothing diff --git a/Text/RE/ZeInternals/TDFA.hs b/Text/RE/ZeInternals/TDFA.hs --- a/Text/RE/ZeInternals/TDFA.hs +++ b/Text/RE/ZeInternals/TDFA.hs @@ -310,7 +310,7 @@ preludeSources :: String preludeSources = preludeMacroSources regexType --- | the prolude source of a given macro in the standard environment +-- | the prelude source of a given macro in the standard environment preludeSource :: PreludeMacro -> String preludeSource = preludeMacroSource regexType @@ -363,7 +363,7 @@ -- @countMatches $ s *=~ [re_|[0-9a-f]+|] MultilineInsensitive@ -- -- counts the number of hexadecimal digit strings in 's', allowing --- for upper- or lower-case hex didgits (which is entirely equivalent +-- for upper- or lower-case hex digits (which is entirely equivalent -- in this example to just using @[reMultilineInsensitive|[0-9a-f]+|]@). re_ :: QuasiQuoter re_ = re' Nothing diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,5 +1,8 @@ -*-change-log-*- +1.1.0.2 Igor Ranieri Elland 2022-05-20 +* fix for [#171](https://github.com/iconnect/regex/issues/171) + 1.1.0.1 Chris Dornan 2018-12-19 * fix for base-4.16.0.0/GHC 9.2.1 * eliminate http-conduit dependency (currently stymied by cryptonite) 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: 1.1.0.1 +Version: 1.1.0.2 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: 1.1.0.1 + Tag: 1.1.0.2