diff --git a/README.markdown b/README.markdown --- a/README.markdown +++ b/README.markdown @@ -1,6 +1,9 @@ # **RegExChar** -[![Hackage](https://img.shields.io/hackage/v/regexchar.svg)](https://hackage.haskell.org/package/regexchar) [![Build Status](https://travis-ci.org/functionalley/RegExChar.svg?branch=master)](https://travis-ci.org/functionalley/RegExChar) +[![Build Status](https://travis-ci.org/functionalley/RegExChar.svg?branch=master)](https://travis-ci.org/functionalley/RegExChar) +[![Hackage](https://img.shields.io/hackage/v/regexchar.svg)](https://hackage.haskell.org/package/regexchar) +[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) +[![Haskell](https://b.repl.ca/v1/language-haskell-yellow.png)](https://haskell.org) This is "**RegExChar**", a regex-engine built from the polymorphic regex-engine "**RegExDot**" as a proof of concept. @@ -10,7 +13,7 @@ ## Documentation * The directory "**man/**" contains the documentation. -* More information about this application can be found at [RegExChar](http://functionalley.eu/RegExChar/regExChar.html). +* More information about this application can be found at [RegExChar](https://functionalley.com/RegExChar/regExChar.html). ## License @@ -18,7 +21,7 @@ ## Bug-reporting -Bug-reports should be emailed to . +Bug-reports should be emailed to . ## Testing diff --git a/changelog.Debian b/changelog.Debian --- a/changelog.Debian +++ b/changelog.Debian @@ -4,17 +4,17 @@ regexchar (0.9.0.7-1) experimental; urgency=low - * Uploaded to . + * Uploaded to . regexchar (0.9.0.8-1) experimental; urgency=low * - -- Alistair Ward Wed, 12 Jan 2011 00:00:00 +0000 + -- Alistair Ward Wed, 12 Jan 2011 00:00:00 +0000 regexchar (0.9.0.10-1) experimental; urgency=low * - -- Alistair Ward Sat, 06 May 2012 00:00:00 +0000 + -- Alistair Ward Sat, 06 May 2012 00:00:00 +0000 diff --git a/changelog.markdown b/changelog.markdown --- a/changelog.markdown +++ b/changelog.markdown @@ -1,4 +1,4 @@ -# 2010-11-18 Dr. Alistair Ward +# 2010-11-18 Dr. Alistair Ward ## 0.9.0.0 * First version of the package. @@ -43,7 +43,7 @@ * Changed identifier for type-parameters, to better reflect its role. * Removed dependency on archaic module "**ToolShed.Arithmetic**". * Reacted to the creation of module "**ToolShed.Defaultable**". -* Uploaded to [Hackage](http://hackage.haskell.org/package/regexchar). +* Uploaded to [Hackage](https://hackage.haskell.org/package/regexchar). ## 0.9.0.8 * Amended the *.cabal*-file to more correctly specify dependency on package "**toolshed**". @@ -106,4 +106,7 @@ * Removed dependency on **Distribution.Package.PackageName** ## 0.9.0.16 + +## 0.9.0.17 +Changed references to author's domain-name. diff --git a/copyright b/copyright --- a/copyright +++ b/copyright @@ -1,11 +1,11 @@ Author: - Dr. Alistair Ward . + Dr. Alistair Ward . Copyright: Copyright (C) 2010-2011 Dr. Alistair Ward. All Rights Reserved. Home-page: - http://functionalley.eu/RegExChar/regExChar.html + https://functionalley.com/RegExChar/regExChar.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'. diff --git a/debian/DEBIAN/control b/debian/DEBIAN/control --- a/debian/DEBIAN/control +++ b/debian/DEBIAN/control @@ -1,13 +1,13 @@ Package: regexchar -Version: 0.9.0.16-1 +Version: 0.9.0.17-1 Section: text Priority: optional Architecture: amd64 Depends: libc6 Installed-size: 3222 -Maintainer: Dr. Alistair Ward +Maintainer: Dr. Alistair Ward Provides: -Homepage: http://functionalley.eu/RegExChar/regExChar.html +Homepage: https://functionalley.com/RegExChar/regExChar.html Description: POSIX extended regular-expression engine. POSIX extended regex-engine, specialised from the underlying polymorphic engine regexdot, to merely process character-lists, as is typically required. diff --git a/man/man1/grecce.1 b/man/man1/grecce.1 --- a/man/man1/grecce.1 +++ b/man/man1/grecce.1 @@ -77,7 +77,7 @@ to process alternative sub-expressions and multiple files in parallel; When specifying this option, it is usually beneficial, given sufficient resources, to suggest a large minimum heap-size for the garbage-collector. .br -. +. .PP These options are rather esoteric & not normally required. .br @@ -178,7 +178,7 @@ Written by Dr. Alistair Ward. .SH BUGS .SS "REPORTING BUGS" -Report bugs to <\fBgrecce@functionalley.eu\fR>. +Report bugs to <\fBgrecce@functionalley.com\fR>. .SS Known Bugs There is no support for either \fIBack-references\fR or \fICase-insensitivity\fR. .PP @@ -192,18 +192,18 @@ .PP This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with this program. If not, see \fB\fR. +You should have received a copy of the GNU General Public License along with this program. If not, see \fB\fR. .SH "SEE ALSO" .IP \(bu -Home-page: \fBhttp://functionalley.eu/RegExChar/regExChar.html\fR +Home-page: \fBhttps://functionalley.com/RegExChar/regExChar.html\fR .IP \(bu -.B http://hackage.haskell.org/package/regexchar +.B https://hackage.haskell.org/package/regexchar .IP \(bu .B https://github.com/functionalley/RegExChar .IP \(bu Source-documentation is generated by "\fBHaddock\fR", & is available in the distribution. .IP \(bu -.B http://www.haskell.org/haddock/ +.B https://www.haskell.org/haddock/ .IP \(bu \fBRegExDot\fR, the polymorphic regex-engine from which this is built. diff --git a/regexchar.cabal b/regexchar.cabal --- a/regexchar.cabal +++ b/regexchar.cabal @@ -14,7 +14,7 @@ -- along with RegExChar. If not, see . Name: regexchar -Version: 0.9.0.16 +Version: 0.9.0.17 Cabal-version: >= 1.10 Copyright: (C) 2010-2015 Dr. Alistair Ward License: GPL @@ -25,10 +25,10 @@ Build-type: Simple Description: Provides a POSIX, extended regex-engine, specialised from the underlying /polymorphic/ package /regexdot/, to merely process the traditional character-lists. Category: Regex, Text -Tested-with: GHC == 7.4, GHC == 7.6, GHC == 7.8, GHC == 7.10, GHC == 8.0, GHC == 8.2 -Homepage: http://functionalley.eu/RegExChar/regExChar.html -Maintainer: mailto:regexchar@functionalley.eu -Bug-reports: mailto:regexchar@functionalley.eu +Tested-with: GHC == 7.4, GHC == 7.6, GHC == 7.8, GHC == 7.10, GHC == 8.0, GHC == 8.2, GHC == 8.4, GHC == 8.6 +Homepage: https://functionalley.com/RegExChar/regExChar.html +Maintainer: mailto:regexchar@functionalley.com +Bug-reports: mailto:regexchar@functionalley.com -- These files can be read by the application from 'Paths_weekdaze.datadir'. Data-files: @@ -88,7 +88,7 @@ GHC-prof-options: -fprof-auto -fprof-cafs if impl(ghc >= 8.0) - GHC-options: -j -Wredundant-constraints + GHC-options: -Wredundant-constraints else GHC-prof-options: -auto-all -caf-all @@ -130,7 +130,7 @@ GHC-prof-options: -fprof-auto -fprof-cafs -rtsopts -with-rtsopts=-H10M if impl(ghc >= 8.0) - GHC-options: -j -Wredundant-constraints + GHC-options: -Wredundant-constraints else GHC-prof-options: -auto-all -caf-all @@ -158,5 +158,5 @@ toolshed >= 0.17 if impl(ghc >= 8.0) - GHC-options: -j -Wredundant-constraints + GHC-options: -Wredundant-constraints diff --git a/regexchar.spec b/regexchar.spec --- a/regexchar.spec +++ b/regexchar.spec @@ -11,7 +11,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 . +# along with this program. If not, see . %define package %name-%version %define tarBall %package.tar.gz @@ -22,13 +22,13 @@ Summary: A re-implementation of egrep, using a specialisation of a polymorphic regex-engine Name: regexchar -Version: 0.9.0.16 +Version: 0.9.0.17 Release: 1 License: GPLv3 # From '/usr/share/doc/packages/rpm/GROUPS'. Group: Applications/Text -Source0: http://functionalley.eu/Downloads/sdist/%tarBall -URL: http://functionalley.eu/RegExChar/regExChar.html +Source0: https://functionalley.com/Downloads/sdist/%tarBall +URL: https://functionalley.com/RegExChar/regExChar.html Prefix: /usr BuildRequires: haskell-platform @@ -64,6 +64,6 @@ %attr(0644, root, root) %doc %_mandir/man1/grecce.1.gz %changelog -* Wed May 09 2012 Alistair Ward 0.9.0.10-1 +* Wed May 09 2012 Alistair Ward 0.9.0.10-1 First cut. diff --git a/src-exe/Grecce/Test/Performance/ExtendedRegEx.hs b/src-exe/Grecce/Test/Performance/ExtendedRegEx.hs --- a/src-exe/Grecce/Test/Performance/ExtendedRegEx.hs +++ b/src-exe/Grecce/Test/Performance/ExtendedRegEx.hs @@ -13,7 +13,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 . + along with this program. If not, see . -} {- | [@AUTHOR@] Dr. Alistair Ward @@ -96,12 +96,12 @@ isMismatch, if solitary then const True -- CAVEAT: should be 'undefined'. - else not . (Text.Regex.Posix.=~ extendedRegExCharString) :: String -> Bool -- CAVEAT: . + else not . (Text.Regex.Posix.=~ extendedRegExCharString) :: String -> Bool -- CAVEAT: . ] ) . Control.Arrow.second ( ( \extendedRegEx -> ( - RegExDot.RegEx./~ RegExDot.RegExOpts.MkRegExOpts { -- CAVEAT: . + RegExDot.RegEx./~ RegExDot.RegExOpts.MkRegExOpts { -- CAVEAT: . RegExDot.RegExOpts.compilationOptions = Data.Default.def, RegExDot.RegExOpts.executionOptions = executionOptions, RegExDot.RegExOpts.regEx = extendedRegEx @@ -124,11 +124,11 @@ if RegExDot.ExecutionOptions.requireMatchList executionOptions then if solitary then const "" --- else (Text.Regex.Posix.=~ extendedRegExCharString) :: String -> String -- CAVEAT: . - else (\(_, _, _, s) -> show s) . ((Text.Regex.Posix.=~ extendedRegExCharString) :: String -> (String, String, String, [String])) -- CAVEAT: . +-- else (Text.Regex.Posix.=~ extendedRegExCharString) :: String -> String -- CAVEAT: . + else (\(_, _, _, s) -> show s) . ((Text.Regex.Posix.=~ extendedRegExCharString) :: String -> (String, String, String, [String])) -- CAVEAT: . else show . if solitary then const True -- CAVEAT: should be 'undefined'. - else (Text.Regex.Posix.=~ extendedRegExCharString) :: String -> Bool -- CAVEAT: . + else (Text.Regex.Posix.=~ extendedRegExCharString) :: String -> Bool -- CAVEAT: . ] ) ) . Control.Arrow.second ( @@ -141,8 +141,8 @@ RegExDot.RegExOpts.regEx = extendedRegEx } -- Similar to 'RegexLike.makeRegexOpts', but without the requirement to read the regex. in if RegExDot.ExecutionOptions.requireMatchList executionOptions - then show . (RegExDot.RegEx.+~ regExOpts) -- CAVEAT: . - else show . (RegExDot.RegEx.=~ regExOpts) -- CAVEAT: . + then show . (RegExDot.RegEx.+~ regExOpts) -- CAVEAT: . + else show . (RegExDot.RegEx.=~ regExOpts) -- CAVEAT: . ) &&& show . ExtendedRegExChar.MkExtendedRegExChar False {-hasNonCapturingTopLevelAlternatives-} ) . testGenerator diff --git a/src-exe/Grecce/Test/Performance/ExtendedRegExTestsPositive.hs b/src-exe/Grecce/Test/Performance/ExtendedRegExTestsPositive.hs --- a/src-exe/Grecce/Test/Performance/ExtendedRegExTestsPositive.hs +++ b/src-exe/Grecce/Test/Performance/ExtendedRegExTestsPositive.hs @@ -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 . + along with this program. If not, see . -} {- | [@AUTHOR@] Dr. Alistair Ward @@ -110,7 +110,7 @@ ), {- "(|{2})*c". - Explanation: from + Explanation: from Performance: disastrous performance. -} ( @@ -323,7 +323,7 @@ * . - * . + * . -} triangularSeries :: Integral i => i -> i triangularSeries i = i * succ i `div` 2 diff --git a/src-lib/RegExChar/ExtendedRegExChar.hs b/src-lib/RegExChar/ExtendedRegExChar.hs --- a/src-lib/RegExChar/ExtendedRegExChar.hs +++ b/src-lib/RegExChar/ExtendedRegExChar.hs @@ -14,7 +14,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 . + along with this program. If not, see . -} {- | [@AUTHOR@] Dr. Alistair Ward @@ -188,14 +188,14 @@ :: InputData -- ^ The input-data string. -> RegExDot.RegExOpts.RegExOpts ExtendedRegExChar -- ^ The match-options, parameterised by the regex-specification. -> RegExDot.RegEx.Result Char -inputData +~ regExOpts = inputData RegExDot.RegEx.+~ fmap extendedRegEx regExOpts -- CAVEAT: . +inputData +~ regExOpts = inputData RegExDot.RegEx.+~ fmap extendedRegEx regExOpts -- CAVEAT: . -- | A veneer over the underlying polymorphic operator, 'RegExDot.RegEx.=~'. (=~) :: InputData -- ^ The input-data string. -> RegExDot.RegExOpts.RegExOpts ExtendedRegExChar -- ^ The match-options, parameterised by the regex-specification. -> Bool -inputData =~ regExOpts = inputData RegExDot.RegEx.=~ fmap extendedRegEx regExOpts -- CAVEAT: . +inputData =~ regExOpts = inputData RegExDot.RegEx.=~ fmap extendedRegEx regExOpts -- CAVEAT: . -- | Pattern-mismatch operator. (/~) diff --git a/src-lib/RegExChar/RegExOptsChar.hs b/src-lib/RegExChar/RegExOptsChar.hs --- a/src-lib/RegExChar/RegExOptsChar.hs +++ b/src-lib/RegExChar/RegExOptsChar.hs @@ -15,12 +15,12 @@ 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 . + along with this program. If not, see . -} {- | [@AUTHOR@] Dr. Alistair Ward - [@DESCRIPTION@] Creates a /back-end/ implementation, conforming to . + [@DESCRIPTION@] Creates a /back-end/ implementation, conforming to . [@CAVEATS@] @@ -141,7 +141,7 @@ -> [RegExDot.RegEx.MatchList Char] matchUntilFailure regExOptsChar inputData = shiftOffsets 0 $ matchUntilFailure' inputData where matchUntilFailure' :: ExtendedRegExChar.InputData -> [RegExDot.RegEx.MatchList Char] - matchUntilFailure' unmatchedInputData = case unmatchedInputData ExtendedRegExChar.+~ regExOptsChar of -- CAVEAT: . + matchUntilFailure' unmatchedInputData = case unmatchedInputData ExtendedRegExChar.+~ regExOptsChar of -- CAVEAT: . (_, Just matchList, maybeSternAnchorResult) -> matchList : if null (RegExDot.RegEx.extractDataFromMatchList matchList) then [] else matchUntilFailure' (RegExDot.RegEx.extractDataFromMatch' maybeSternAnchorResult) _ -> [] @@ -180,14 +180,14 @@ ) ) `fmap` RegExDot.Result.getMatchList extendedRegExResult where extendedRegExResult :: RegExDot.RegEx.Result Char - extendedRegExResult = inputData ExtendedRegExChar.+~ regExOptsChar -- CAVEAT: . + extendedRegExResult = inputData ExtendedRegExChar.+~ regExOptsChar -- CAVEAT: . {- E.g.: ("xabcdx" RegExOptsChar.=~ "a(b(c?))*d") :: (String, Text.Regex.Base.RegexLike.MatchText String, String) ("x",array (0,2) [(0,("abcd",(1,4))),(1,("bc",(2,2))),(2,("c",(3,1)))],"x") -} -- matchOnceText :: RegExOptsChar -> ExtendedRegExChar.InputData -> Maybe (ExtendedRegExChar.InputData, MatchText ExtendedRegExChar.InputData, ExtendedRegExChar.InputData) - matchOnceText regExOptsChar inputData = case inputData ExtendedRegExChar.+~ regExOptsChar of -- CAVEAT: . + matchOnceText regExOptsChar inputData = case inputData ExtendedRegExChar.+~ regExOptsChar of -- CAVEAT: . (maybeBowAnchorResult, Just matchList, maybeSternAnchorResult) -> Just ( RegExDot.RegEx.extractDataFromMatch' maybeBowAnchorResult, toZeroIndexedArray . exciseNonCapturingTopLevelAlternatives regExOptsChar $ toMatchDataSpanList ( @@ -204,7 +204,7 @@ True -} -- matchTest :: RegExOptsChar -> ExtendedRegExChar.InputData -> Bool - matchTest = flip (ExtendedRegExChar.=~) -- CAVEAT: . + matchTest = flip (ExtendedRegExChar.=~) -- CAVEAT: . {- | * Match-operator.