regexdot 0.12.1.0 → 0.12.2.0
raw patch · 9 files changed
+38/−20 lines, 9 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- README.markdown +5/−2
- changelog.markdown +7/−1
- copyright +1/−1
- regexdot.cabal +3/−3
- src-lib/RegExDot/Consumer.hs +5/−0
- src-lib/RegExDot/ConsumptionProfile.hs +4/−0
- src-lib/RegExDot/DataSpan.hs +2/−2
- src-lib/RegExDot/RegEx.hs +9/−9
- src-lib/RegExDot/Span.hs +2/−2
README.markdown view
@@ -1,6 +1,9 @@ # **RegExDot** -[](https://hackage.haskell.org/package/regexdot) [](https://travis-ci.org/functionalley/RegExDot)+[](https://travis-ci.org/functionalley/RegExDot)+[](https://hackage.haskell.org/package/regexdot)+[](https://www.gnu.org/licenses/gpl-3.0)+[](https://haskell.org) This is "**RegExDot**", a polymorphic regex-engine. @@ -10,7 +13,7 @@ ## Documentation -More information about this library can be found at [RegExDot](http://functionalley.eu/RegExDot/regExDot.html).+More information about this library can be found at [RegExDot](https://functionalley.eu/RegExDot/regExDot.html). ## License
changelog.markdown view
@@ -28,7 +28,7 @@ * Added manually controlled flag "**llvm**" to the *.cabal*-file. * Changed identifier for type-parameters, to better reflect its role. * Reacted to the creation of module "**ToolShed.Defaultable**".-* Uploaded to [Hackage](http://hackage.haskell.org/package/regexdot).+* Uploaded to [Hackage](https://hackage.haskell.org/package/regexdot). ## 0.10.2.2 * Amended the *.cabal*-file to more correctly specify dependency on package "**toolshed**".@@ -77,3 +77,9 @@ ## 0.12.1.0 * Replaced the identifer **pattern**, since this becomes a Haskell-keyword when **PatternSynonyms** are enabled.++## 0.12.1.1+* Accounted for **Prelude** exporting **(Data.Semigroup.<>)**.++## 0.12.2.0+* Bumped version.
copyright view
@@ -5,7 +5,7 @@ Copyright (C) 2010-2011 Dr. Alistair Ward. All Rights Reserved. Home-page:- http://functionalley.eu/RegExDot/regExDot.html+ https://functionalley.eu/RegExDot/regExDot.html License: GNU GENERAL PUBLIC LICENSE Version 3; see '/usr/share/common-licenses/GPL-3' or '/usr/share/doc/licenses/gpl-3.0.txt' where available, or the local packaged file 'LICENSE'.
regexdot.cabal view
@@ -14,7 +14,7 @@ -- along with RegExDot. If not, see <http://www.gnu.org/licenses/>. Name: regexdot-Version: 0.12.1.0+Version: 0.12.2.0 Cabal-version: >= 1.10 Copyright: (C) 2010-2015 Dr. Alistair Ward License: GPL@@ -25,8 +25,8 @@ Build-type: Simple Description: Provides a portable, POSIX, extended regex-engine, designed to process a list of /arbitrary/ objects. Category: Search, Regex-Tested-with: GHC == 7.4, GHC == 7.6, GHC == 7.8, GHC == 7.10, GHC == 8.0, GHC == 8.2-Homepage: http://functionalley.eu/RegExDot/regExDot.html+Tested-with: GHC == 7.4, GHC == 7.6, GHC == 7.8, GHC == 7.10, GHC == 8.0, GHC == 8.2, GHC == 8.4+Homepage: https://functionalley.eu/RegExDot/regExDot.html Maintainer: mailto:regexdot@functionalley.eu Bug-reports: mailto:regexdot@functionalley.eu
src-lib/RegExDot/Consumer.hs view
@@ -1,3 +1,4 @@+{-# LANGUAGE CPP #-} {- Copyright (C) 2010 Dr. Alistair Ward @@ -49,6 +50,10 @@ import qualified Data.List import qualified RegExDot.ConsumptionBounds as ConsumptionBounds import qualified RegExDot.ConsumptionProfile as ConsumptionProfile++#if MIN_VERSION_base(4,11,0)+import Prelude hiding ((<>)) -- N.B.: avoid ambiguity with '(Data.Semigroup.<>)'.+#endif {- | * A measure of the complexity of a /regex/, which has some baring on either the time-complexity or the space-complexity of the solution.
src-lib/RegExDot/ConsumptionProfile.hs view
@@ -49,6 +49,10 @@ import qualified RegExDot.ConsumptionBounds as ConsumptionBounds import qualified ToolShed.SelfValidate +#if MIN_VERSION_base(4,11,0)+import Prelude hiding ((<>)) -- N.B.: avoid ambiguity with '(Data.Semigroup.<>)'.+#endif+ #if !MIN_VERSION_base(4,8,0) import Control.Applicative((<$>), (<*>)) #endif
src-lib/RegExDot/DataSpan.hs view
@@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License- along with this program. If not, see <http://www.gnu.org/licenses/>.+ along with this program. If not, see <https://www.gnu.org/licenses/>. -} {- | [@AUTHOR@] Dr. Alistair Ward@@ -37,7 +37,7 @@ {- | * Augment 'Span.Span' with a copy of the data to which it refers. - * Similar to <http://hackage.haskell.org/packages/archive/regex-base/latest/doc/html/Text-Regex-Base-RegexLike.html#t%3AMatchText>.+ * Similar to <https://hackage.haskell.org/packages/archive/regex-base/latest/doc/html/Text-Regex-Base-RegexLike.html#t%3AMatchText>. -} type DataSpan a = ([a], Span.Span)
src-lib/RegExDot/RegEx.hs view
@@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License- along with this program. If not, see <http://www.gnu.org/licenses/>.+ along with this program. If not, see <https://www.gnu.org/licenses/>. -} {- | [@AUTHOR@] Dr. Alistair Ward@@ -46,23 +46,23 @@ * Char-based regexen, traditionally overload the delimiters of a set of 'Alternatives' (parentheses), as a request for data-capture. Here, in contrast, all 'RepeatablePattern's capture data, & repeated sub-expressions capture a list of data,- rather than arbitrarily recording just the last (<http://www.opengroup.org/onlinepubs/009695399/functions/regcomp.html>) item.+ rather than arbitrarily recording just the last (<https://www.opengroup.org/onlinepubs/009695399/functions/regcomp.html>) item. [@REFERENCES@] * <https://en.wikipedia.org/wiki/Regular_expression> - * <http://swtch.com/~rsc/regexp/regexp1.html>+ * <https://swtch.com/~rsc/regexp/regexp1.html> - * <http://docstore.mik.ua/orelly/perl/prog/ch02_04.htm#PERL2-CH-2-SECT-4.1.2>+ * <https://docstore.mik.ua/orelly/perl/prog/ch02_04.htm#PERL2-CH-2-SECT-4.1.2> - * <http://www.macs.hw.ac.uk/~dsg/gph/papers/html/Strategies/strategies.html>+ * <https://www.macs.hw.ac.uk/~dsg/gph/papers/html/Strategies/strategies.html> - * <http://hackage.haskell.org/packages/archive/regex-posix/latest/doc/html/Text-Regex-Posix.html>+ * <https://hackage.haskell.org/packages/archive/regex-posix/latest/doc/html/Text-Regex-Posix.html> - * <http://www.haskell.org/haskellwiki/Regular_expressions>+ * <https://www.haskell.org/haskellwiki/Regular_expressions> - * <http://www2.research.att.com/~gsf/testregex/re-interpretation.html>+ * <https://www2.research.att.com/~gsf/testregex/re-interpretation.html> [@CAVEATS@] @@ -1044,7 +1044,7 @@ this causes the data-consumption to flow towards earlier repetitions for greedy capture-groups, & towards later repetitions in non-greedy ones, thus mimicking the behaviour of the unrolled repetition. - * PS: more precise criteria are defined in <http://www2.research.att.com/~gsf/testregex/re-interpretation.html>.+ * PS: more precise criteria are defined in <https://www2.research.att.com/~gsf/testregex/re-interpretation.html>. -} \match -> let dataLengthCriterion :: InputData m -> Rational
src-lib/RegExDot/Span.hs view
@@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License- along with this program. If not, see <http://www.gnu.org/licenses/>.+ along with this program. If not, see <https://www.gnu.org/licenses/>. -} {- | [@AUTHOR@] Dr. Alistair Ward@@ -36,7 +36,7 @@ {- | * The offset & length of a specific data-sequence, within a wider list. - * Similar to <http://hackage.haskell.org/packages/archive/regex-base/latest/doc/html/Text-Regex-Base-RegexLike.html#t%3AMatchArray>.+ * Similar to <https://hackage.haskell.org/packages/archive/regex-base/latest/doc/html/Text-Regex-Base-RegexLike.html#t%3AMatchArray>. -} type Span = (ConsumptionBounds.DataLength {-offset-}, ConsumptionBounds.DataLength)