diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,19 +1,34 @@ See also http://pvp.haskell.org/faq +## 0.94.0.2 + +2021-11-16 Andreas Abel + +- Allow `text-2.0` +- Remove unused dependency `mtl` +- Warning free up to GHC 9.2 +- Tested with GHC 7.0 - 9.2 + +## 0.94.0.1 Revision 1 + +2021-08-12 Andreas Abel + +- Allow `base-4.16`, for GHC 9.2 + ## 0.94.0.1 -- Workaround for `{-# LANGUAGE Haskell2010 #-}` parser regression introduced in GHC 9.0 +2021-02-20 Andreas Abel +- Workaround for `{-# LANGUAGE Haskell2010 #-}` parser regression introduced in GHC 9.0 - Optimization flag `-O2` has been removed ## 0.94.0.0 -- **Breaking change**: Switch RegExp API from the previously used `Monad(fail)` to `MonadFail(fail)` to denote matching failures +2019-09-25 Herbert Valerio Riedel +- **Breaking change**: Switch RegExp API from the previously used `Monad(fail)` to `MonadFail(fail)` to denote matching failures - Define `Extract Text` instances for strict and lazy `Text` types - - Compatibility with `base-4.13.0` - - Explicitly declare all modules `Safe` under SafeHaskell for GHC 7.4 and higher ---- diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,3 @@ -This modile is under this "3 clause" BSD license: - Copyright (c) 2007, Christopher Kuklewicz All rights reserved. @@ -7,6 +5,7 @@ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md new file mode 100644 --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +regex-base +[![Hackage version](https://img.shields.io/hackage/v/regex-base.svg?label=Hackage&color=informational)](http://hackage.haskell.org/package/regex-base) +[![Haskell-CI](https://github.com/haskell-hvr/regex-base/actions/workflows/haskell-ci.yml/badge.svg?branch=master&event=push)](https://github.com/haskell-hvr/regex-base/actions/workflows/haskell-ci.yml) +[![License](https://img.shields.io/badge/License-BSD_3--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) +========== + +Common interface to several Haskell implementations of regular expressions. + +[Documentation](https://hackage.haskell.org/package/regex-base/docs/Text-Regex-Base.html) on hackage. diff --git a/regex-base.cabal b/regex-base.cabal --- a/regex-base.cabal +++ b/regex-base.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 name: regex-base -version: 0.94.0.1 +version: 0.94.0.2 build-type: Simple license: BSD3 @@ -11,7 +11,7 @@ Herbert Valerio Riedel , Andreas Abel homepage: https://wiki.haskell.org/Regular_expressions -bug-reports: https://github.com/hvr/regex-base/issues +bug-reports: https://github.com/haskell-hvr/regex-base/issues synopsis: Common "Text.Regex.*" API for Regex matching category: Text description: @@ -33,9 +33,9 @@ extra-source-files: ChangeLog.md + README.md tested-with: - -- Haskell CI: GHC == 7.0.4 GHC == 7.2.2 GHC == 7.4.2 @@ -47,19 +47,18 @@ GHC == 8.4.4 GHC == 8.6.5 GHC == 8.8.4 - GHC == 8.10.3 - -- manually (AA, 2021-02-16): - -- GHC == 8.10.4 - -- GHC == 9.0.1 + GHC == 8.10.7 + GHC == 9.0.1 + GHC == 9.2.1 source-repository head type: git - location: https://github.com/hvr/regex-base.git + location: https://github.com/haskell-hvr/regex-base.git source-repository this type: git - location: https://github.com/hvr/regex-base.git - tag: v0.94.0.1 + location: https://github.com/haskell-hvr/regex-base.git + tag: v0.94.0.2 library hs-source-dirs: src @@ -86,14 +85,15 @@ build-depends: containers >= 0.4.2.1 , bytestring >= 0.9.2.1 - build-depends: base >= 4.3 && < 4.16 - , mtl >= 1.1 && < 2.3 + build-depends: base >= 4.3 && < 4.17 , containers >= 0.4 && < 0.7 , bytestring >= 0.9 && < 0.12 , array >= 0.3 && < 0.6 - , text >= 1.2.3 && < 1.3 + , text >= 1.2.3 && < 1.3 || >=2.0 && <2.1 if !impl(ghc >= 8) build-depends: fail == 4.9.* ghc-options: -Wall + if impl(ghc >= 8) + ghc-options: -Wcompat diff --git a/src/Text/Regex/Base.hs b/src/Text/Regex/Base.hs --- a/src/Text/Regex/Base.hs +++ b/src/Text/Regex/Base.hs @@ -6,8 +6,8 @@ -- Copyright : (c) Chris Kuklewicz 2006 -- SPDX-License-Identifier: BSD-3-Clause -- --- Maintainer : hvr@gnu.org --- Stability : experimental +-- Maintainer : hvr@gnu.org, Andreas Abel +-- Stability : stable -- Portability : non-portable (MPTC+FD) -- -- Classes and instances for Regex matching. @@ -40,21 +40,23 @@ -- -- == Example -- --- The code below +-- The code -- -- @ -- import Text.Regex.Base --- import Text.Regex.Posix((=~),(=~~)) -- or DFA or PCRE or PosixRE +-- import Text.Regex.Posix ((=~),(=~~)) -- or TDFA or PCRE or ... -- --- main = let b :: Bool --- b = ("abaca" =~ "(.)a") --- c :: [MatchArray] --- c = ("abaca" =~ "(.)a") --- d :: Maybe (String,String,String,[String]) --- d = ("abaca" =~~ "(.)a") --- in do print b --- print c --- print d +-- main = do +-- print b +-- print c +-- print d +-- where +-- b :: Bool +-- b = ("abaca" =~ "(.)a") +-- c :: [MatchArray] +-- c = ("abaca" =~ "(.)a") +-- d :: Maybe (String,String,String,[String]) +-- d = ("abaca" =~~ "(.)a") -- @ -- -- will output diff --git a/src/Text/Regex/Base/Context.hs b/src/Text/Regex/Base/Context.hs --- a/src/Text/Regex/Base/Context.hs +++ b/src/Text/Regex/Base/Context.hs @@ -1,13 +1,19 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE MultiParamTypeClasses, FlexibleInstances, FlexibleContexts, TypeSynonymInstances #-} + {-# OPTIONS_GHC -fno-warn-orphans #-} +#if __GLASGOW_HASKELL__ >= 702 +{-# OPTIONS_GHC -fno-warn-incomplete-uni-patterns #-} +#endif + {-| Module : Text.Regex.Base.Context Copyright : (c) Chris Kuklewicz 2006 SPDX-License-Identifier: BSD-3-Clause -Maintainer : hvr@gnu.org -Stability : experimental +Maintainer : hvr@gnu.org, Andreas Abel +Stability : stable Portability : non-portable (MPTC+FD) This is a module of instances of 'RegexContext' (defined in diff --git a/src/Text/Regex/Base/Impl.hs b/src/Text/Regex/Base/Impl.hs --- a/src/Text/Regex/Base/Impl.hs +++ b/src/Text/Regex/Base/Impl.hs @@ -4,8 +4,8 @@ -- Copyright : (c) Chris Kuklewicz 2006 -- SPDX-License-Identifier: BSD-3-Clause -- --- Maintainer : hvr@gnu.org --- Stability : experimental +-- Maintainer : hvr@gnu.org, Andreas Abel +-- Stability : stable -- Portability : non-portable (Text.Regex.Base needs MPTC+FD) -- -- Helper functions for defining certain instances of diff --git a/src/Text/Regex/Base/RegexLike.hs b/src/Text/Regex/Base/RegexLike.hs --- a/src/Text/Regex/Base/RegexLike.hs +++ b/src/Text/Regex/Base/RegexLike.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, TypeSynonymInstances #-} ----------------------------------------------------------------------------- -- | @@ -5,8 +6,8 @@ -- Copyright : (c) Chris Kuklewicz 2006 -- SPDX-License-Identifier: BSD-3-Clause -- --- Maintainer : hvr@gnu.org --- Stability : experimental +-- Maintainer : hvr@gnu.org, Andreas Abel +-- Stability : stable -- Portability : non-portable (MPTC+FD) -- -- Classes and instances for Regex matching. @@ -38,9 +39,9 @@ AllSubmatches(..),AllTextSubmatches(..),AllMatches(..),AllTextMatches(..) ) where -import Prelude hiding (fail) +#if !MIN_VERSION_base(4,13,0) import Control.Monad.Fail as Fail (MonadFail) - +#endif import Data.Array(Array,(!)) import Data.Maybe(isJust) import qualified Data.ByteString as SB (take,drop,empty,ByteString) @@ -70,7 +71,7 @@ } --- | Rather than carry them around spearately, the options for how to +-- | Rather than carry them around separately, the options for how to -- execute a regex are kept as part of the regex. There are two types -- of options. Those that can only be specified at compilation time -- and never changed are @compOpt@. Those that can be changed later and