Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Hackage](https://img.shields.io/hackage/v/regex.svg)](https://hackage.haskell.org/package/regex)
[![BSD3 License](http://img.shields.io/badge/license-BSD3-brightgreen.svg)](https://tldrlegal.com/license/bsd-3-clause-license-%28revised%29)
[![Un*x build](https://img.shields.io/travis/iconnect/regex.svg?label=Linux%2FmacOS)](https://travis-ci.org/iconnect/regex)
[![Un*x build](https://img.shields.io/travis/iconnect/regex.svg?label=Linux%2BmacOS)](https://travis-ci.org/iconnect/regex)
[![Windows build](https://img.shields.io/appveyor/ci/engineerirngirisconnectcouk/regex.svg?label=Windows)](https://ci.appveyor.com/project/engineerirngirisconnectcouk/regex/branch/master)
[![Coverage](https://img.shields.io/coveralls/iconnect/regex.svg)](https://coveralls.io/github/iconnect/regex?branch=master)

Expand All @@ -25,10 +25,11 @@ regex extends regex-base with:
Schedule
--------

* **2017-01-27**  0.0.0.1  Pre-release
* **2017-01-30**  0.0.1.0  RFC
* **2017-02-20**  0.1.0.0  a candidate stable release
* **2017-03-20**  1.0.0.0  first stable release
- [X] **2017-01-26**  0.0.0.1  Pre-release (I)
- [X] **2017-01-30**  0.0.0.2  Pre-release (II)
- [ ] **2017-02-06**  0.0.1.0  RFC
- [ ] **2017-02-20**  0.1.0.0  a candidate stable release
- [ ] **2017-03-20**  1.0.0.0  first stable release


The Web Page
Expand Down
4 changes: 4 additions & 0 deletions Text/RE/PCRE/ByteString.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ import Text.RE.PCRE.RE
import qualified Text.Regex.PCRE as PCRE


-- | find all matches in text
(*=~) :: B.ByteString
-> RE
-> Matches B.ByteString
(*=~) bs rex = addCaptureNamesToMatches (reCaptureNames rex) $ match (reRegex rex) bs

-- | find first matches in text
(?=~) :: B.ByteString
-> RE
-> Match B.ByteString
(?=~) bs rex = addCaptureNamesToMatch (reCaptureNames rex) $ match (reRegex rex) bs

-- | regex-base polymorphic match operator
(=~) :: ( RegexContext PCRE.Regex B.ByteString a
, RegexMaker PCRE.Regex PCRE.CompOption PCRE.ExecOption String
)
Expand All @@ -38,6 +41,7 @@ import qualified Text.Regex.PCRE as PCRE
-> a
(=~) bs rex = match (reRegex rex) bs

-- | regex-base monadic, polymorphic match operator
(=~~) :: ( Monad m
, RegexContext PCRE.Regex B.ByteString a
, RegexMaker PCRE.Regex PCRE.CompOption PCRE.ExecOption String
Expand Down
4 changes: 4 additions & 0 deletions Text/RE/PCRE/ByteString/Lazy.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ import Text.RE.PCRE.RE
import qualified Text.Regex.PCRE as PCRE


-- | find all matches in text
(*=~) :: LBS.ByteString
-> RE
-> Matches LBS.ByteString
(*=~) bs rex = addCaptureNamesToMatches (reCaptureNames rex) $ match (reRegex rex) bs

-- | find first matches in text
(?=~) :: LBS.ByteString
-> RE
-> Match LBS.ByteString
(?=~) bs rex = addCaptureNamesToMatch (reCaptureNames rex) $ match (reRegex rex) bs

-- | regex-base polymorphic match operator
(=~) :: ( RegexContext PCRE.Regex LBS.ByteString a
, RegexMaker PCRE.Regex PCRE.CompOption PCRE.ExecOption String
)
Expand All @@ -38,6 +41,7 @@ import qualified Text.Regex.PCRE as PCRE
-> a
(=~) bs rex = match (reRegex rex) bs

-- | regex-base monadic, polymorphic match operator
(=~~) :: ( Monad m
, RegexContext PCRE.Regex LBS.ByteString a
, RegexMaker PCRE.Regex PCRE.CompOption PCRE.ExecOption String
Expand Down
4 changes: 4 additions & 0 deletions Text/RE/PCRE/Sequence.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ import Text.RE.PCRE.RE
import qualified Text.Regex.PCRE as PCRE


-- | find all matches in text
(*=~) :: (S.Seq Char)
-> RE
-> Matches (S.Seq Char)
(*=~) bs rex = addCaptureNamesToMatches (reCaptureNames rex) $ match (reRegex rex) bs

-- | find first matches in text
(?=~) :: (S.Seq Char)
-> RE
-> Match (S.Seq Char)
(?=~) bs rex = addCaptureNamesToMatch (reCaptureNames rex) $ match (reRegex rex) bs

-- | regex-base polymorphic match operator
(=~) :: ( RegexContext PCRE.Regex (S.Seq Char) a
, RegexMaker PCRE.Regex PCRE.CompOption PCRE.ExecOption String
)
Expand All @@ -38,6 +41,7 @@ import qualified Text.Regex.PCRE as PCRE
-> a
(=~) bs rex = match (reRegex rex) bs

-- | regex-base monadic, polymorphic match operator
(=~~) :: ( Monad m
, RegexContext PCRE.Regex (S.Seq Char) a
, RegexMaker PCRE.Regex PCRE.CompOption PCRE.ExecOption String
Expand Down
4 changes: 4 additions & 0 deletions Text/RE/PCRE/String.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ import Text.RE.PCRE.RE
import qualified Text.Regex.PCRE as PCRE


-- | find all matches in text
(*=~) :: String
-> RE
-> Matches String
(*=~) bs rex = addCaptureNamesToMatches (reCaptureNames rex) $ match (reRegex rex) bs

-- | find first matches in text
(?=~) :: String
-> RE
-> Match String
(?=~) bs rex = addCaptureNamesToMatch (reCaptureNames rex) $ match (reRegex rex) bs

-- | regex-base polymorphic match operator
(=~) :: ( RegexContext PCRE.Regex String a
, RegexMaker PCRE.Regex PCRE.CompOption PCRE.ExecOption String
)
Expand All @@ -38,6 +41,7 @@ import qualified Text.Regex.PCRE as PCRE
-> a
(=~) bs rex = match (reRegex rex) bs

-- | regex-base monadic, polymorphic match operator
(=~~) :: ( Monad m
, RegexContext PCRE.Regex String a
, RegexMaker PCRE.Regex PCRE.CompOption PCRE.ExecOption String
Expand Down
4 changes: 4 additions & 0 deletions Text/RE/TDFA/ByteString.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ import Text.RE.TDFA.RE
import qualified Text.Regex.TDFA as TDFA


-- | find all matches in text
(*=~) :: B.ByteString
-> RE
-> Matches B.ByteString
(*=~) bs rex = addCaptureNamesToMatches (reCaptureNames rex) $ match (reRegex rex) bs

-- | find first matches in text
(?=~) :: B.ByteString
-> RE
-> Match B.ByteString
(?=~) bs rex = addCaptureNamesToMatch (reCaptureNames rex) $ match (reRegex rex) bs

-- | regex-base polymorphic match operator
(=~) :: ( RegexContext TDFA.Regex B.ByteString a
, RegexMaker TDFA.Regex TDFA.CompOption TDFA.ExecOption String
)
Expand All @@ -38,6 +41,7 @@ import qualified Text.Regex.TDFA as TDFA
-> a
(=~) bs rex = match (reRegex rex) bs

-- | regex-base monadic, polymorphic match operator
(=~~) :: ( Monad m
, RegexContext TDFA.Regex B.ByteString a
, RegexMaker TDFA.Regex TDFA.CompOption TDFA.ExecOption String
Expand Down
4 changes: 4 additions & 0 deletions Text/RE/TDFA/ByteString/Lazy.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ import Text.RE.TDFA.RE
import qualified Text.Regex.TDFA as TDFA


-- | find all matches in text
(*=~) :: LBS.ByteString
-> RE
-> Matches LBS.ByteString
(*=~) bs rex = addCaptureNamesToMatches (reCaptureNames rex) $ match (reRegex rex) bs

-- | find first matches in text
(?=~) :: LBS.ByteString
-> RE
-> Match LBS.ByteString
(?=~) bs rex = addCaptureNamesToMatch (reCaptureNames rex) $ match (reRegex rex) bs

-- | regex-base polymorphic match operator
(=~) :: ( RegexContext TDFA.Regex LBS.ByteString a
, RegexMaker TDFA.Regex TDFA.CompOption TDFA.ExecOption String
)
Expand All @@ -38,6 +41,7 @@ import qualified Text.Regex.TDFA as TDFA
-> a
(=~) bs rex = match (reRegex rex) bs

-- | regex-base monadic, polymorphic match operator
(=~~) :: ( Monad m
, RegexContext TDFA.Regex LBS.ByteString a
, RegexMaker TDFA.Regex TDFA.CompOption TDFA.ExecOption String
Expand Down
4 changes: 4 additions & 0 deletions Text/RE/TDFA/Sequence.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ import Text.RE.TDFA.RE
import qualified Text.Regex.TDFA as TDFA


-- | find all matches in text
(*=~) :: (S.Seq Char)
-> RE
-> Matches (S.Seq Char)
(*=~) bs rex = addCaptureNamesToMatches (reCaptureNames rex) $ match (reRegex rex) bs

-- | find first matches in text
(?=~) :: (S.Seq Char)
-> RE
-> Match (S.Seq Char)
(?=~) bs rex = addCaptureNamesToMatch (reCaptureNames rex) $ match (reRegex rex) bs

-- | regex-base polymorphic match operator
(=~) :: ( RegexContext TDFA.Regex (S.Seq Char) a
, RegexMaker TDFA.Regex TDFA.CompOption TDFA.ExecOption String
)
Expand All @@ -38,6 +41,7 @@ import qualified Text.Regex.TDFA as TDFA
-> a
(=~) bs rex = match (reRegex rex) bs

-- | regex-base monadic, polymorphic match operator
(=~~) :: ( Monad m
, RegexContext TDFA.Regex (S.Seq Char) a
, RegexMaker TDFA.Regex TDFA.CompOption TDFA.ExecOption String
Expand Down
4 changes: 4 additions & 0 deletions Text/RE/TDFA/String.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ import Text.RE.TDFA.RE
import qualified Text.Regex.TDFA as TDFA


-- | find all matches in text
(*=~) :: String
-> RE
-> Matches String
(*=~) bs rex = addCaptureNamesToMatches (reCaptureNames rex) $ match (reRegex rex) bs

-- | find first matches in text
(?=~) :: String
-> RE
-> Match String
(?=~) bs rex = addCaptureNamesToMatch (reCaptureNames rex) $ match (reRegex rex) bs

-- | regex-base polymorphic match operator
(=~) :: ( RegexContext TDFA.Regex String a
, RegexMaker TDFA.Regex TDFA.CompOption TDFA.ExecOption String
)
Expand All @@ -38,6 +41,7 @@ import qualified Text.Regex.TDFA as TDFA
-> a
(=~) bs rex = match (reRegex rex) bs

-- | regex-base monadic, polymorphic match operator
(=~~) :: ( Monad m
, RegexContext TDFA.Regex String a
, RegexMaker TDFA.Regex TDFA.CompOption TDFA.ExecOption String
Expand Down
4 changes: 4 additions & 0 deletions Text/RE/TDFA/Text.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ import Text.RE.TDFA.RE
import qualified Text.Regex.TDFA as TDFA


-- | find all matches in text
(*=~) :: T.Text
-> RE
-> Matches T.Text
(*=~) bs rex = addCaptureNamesToMatches (reCaptureNames rex) $ match (reRegex rex) bs

-- | find first matches in text
(?=~) :: T.Text
-> RE
-> Match T.Text
(?=~) bs rex = addCaptureNamesToMatch (reCaptureNames rex) $ match (reRegex rex) bs

-- | regex-base polymorphic match operator
(=~) :: ( RegexContext TDFA.Regex T.Text a
, RegexMaker TDFA.Regex TDFA.CompOption TDFA.ExecOption String
)
Expand All @@ -38,6 +41,7 @@ import qualified Text.Regex.TDFA as TDFA
-> a
(=~) bs rex = match (reRegex rex) bs

-- | regex-base monadic, polymorphic match operator
(=~~) :: ( Monad m
, RegexContext TDFA.Regex T.Text a
, RegexMaker TDFA.Regex TDFA.CompOption TDFA.ExecOption String
Expand Down
4 changes: 4 additions & 0 deletions Text/RE/TDFA/Text/Lazy.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ import Text.RE.TDFA.RE
import qualified Text.Regex.TDFA as TDFA


-- | find all matches in text
(*=~) :: TL.Text
-> RE
-> Matches TL.Text
(*=~) bs rex = addCaptureNamesToMatches (reCaptureNames rex) $ match (reRegex rex) bs

-- | find first matches in text
(?=~) :: TL.Text
-> RE
-> Match TL.Text
(?=~) bs rex = addCaptureNamesToMatch (reCaptureNames rex) $ match (reRegex rex) bs

-- | regex-base polymorphic match operator
(=~) :: ( RegexContext TDFA.Regex TL.Text a
, RegexMaker TDFA.Regex TDFA.CompOption TDFA.ExecOption String
)
Expand All @@ -38,6 +41,7 @@ import qualified Text.Regex.TDFA as TDFA
-> a
(=~) bs rex = match (reRegex rex) bs

-- | regex-base monadic, polymorphic match operator
(=~~) :: ( Monad m
, RegexContext TDFA.Regex TL.Text a
, RegexMaker TDFA.Regex TDFA.CompOption TDFA.ExecOption String
Expand Down
9 changes: 8 additions & 1 deletion changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
-*-change-log-*-

0.0.0.1 Chris Dornan <chrisd@irisconnect.co.uk> Feb 2014
0.0.0.2 Chris Dornan <chris.dornan@irisconnect.co.uk> 2017-01-30
* Fix for Windows
* Remove hsyslog dependency
* Establish Travis CI, AppVeyor and coveralls.io integrations
* Fix time parser to use Fixed arithmetic
* Miscelaneous minor adjustments

0.0.0.1 Chris Dornan <chris.dornan@irisconnect.co.uk> 2017-01-26
* First public release
9 changes: 5 additions & 4 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ regex extends regex-base with:
Schedule
--------

* **2017-01-27**&nbsp;&nbsp;0.0.0.1&nbsp;&nbsp;Pre-release
* **2017-01-30**&nbsp;&nbsp;0.0.1.0&nbsp;&nbsp;RFC
* **2017-02-20**&nbsp;&nbsp;0.1.0.0&nbsp;&nbsp;a candidate stable release
* **2017-03-20**&nbsp;&nbsp;1.0.0.0&nbsp;&nbsp;first stable release
- [X] **2017-01-26**&nbsp;&nbsp;0.0.0.1&nbsp;&nbsp;Pre-release (I)
- [X] **2017-01-30**&nbsp;&nbsp;0.0.0.2&nbsp;&nbsp;Pre-release (II)
- [ ] **2017-02-06**&nbsp;&nbsp;0.0.1.0&nbsp;&nbsp;RFC
- [ ] **2017-02-20**&nbsp;&nbsp;0.1.0.0&nbsp;&nbsp;a candidate stable release
- [ ] **2017-03-20**&nbsp;&nbsp;1.0.0.0&nbsp;&nbsp;first stable release


Installation Instructions
Expand Down
13 changes: 8 additions & 5 deletions regex.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: regex
Version: 0.0.0.1
Version: 0.0.0.2
Synopsis: A Regular Expression Toolkit for regex-base
Description: A Regular Expression Toolkit for regex-base with
Compile-time checking of RE syntax, data types for
Expand All @@ -16,19 +16,22 @@ Copyright: Chris Dornan 2016-2017
Category: Text
Build-type: Simple
Stability: rfc
Extra-source-files: changelog
bug-reports: https://github.com/iconnect/regex/issues

extra-source-files:
README.md
changelog

Cabal-version: >= 1.16

Source-repository head
type: git
location: https://github.com/iconnect/regex.git

Source-Repository this
Type: git
Location: https://github.com/iconnect/regex.git
Tag: 0.0.0.1
Type: git
Location: https://github.com/iconnect/regex.git
Tag: 0.0.0.2

Library
Exposed-modules:
Expand Down