regex 1.1.0.0 → 1.1.0.1
raw patch · 7 files changed
+18/−11 lines, 7 filesdep ~basedep ~regex-tdfa
Dependency ranges changed: base, regex-tdfa
Files
- README.md +1/−0
- Text/RE/REOptions.lhs +3/−7
- Text/RE/ZeInternals/TestBench/Parsers.hs +5/−1
- Text/RE/ZeInternals/Types/Match.lhs +1/−0
- Text/RE/ZeInternals/Types/Matches.lhs +1/−0
- changelog +4/−0
- regex.cabal +3/−3
README.md view
@@ -43,6 +43,7 @@ - [X] 2018-12-18 v1.0.1.5 [TDFA quasi quoters not dealing with newlines](https://github.com/iconnect/regex/milestone/24) - [X] 2018-12-19 v1.0.2.0 [Tidy build issues](https://github.com/iconnect/regex/milestone/25) - [X] 2020-01-27 v1.1.0.0 [Adapt for MonadFail/base-4.13/GHC-8.8](https://github.com/iconnect/regex/milestone/26)+- [X] 2021-12-18 v1.1.0.1 [Fix for base-4.16.0.0/GHC 9.2.1](https://github.com/iconnect/regex/milestone/27) See the [Roadmap page](http://roadmap.regex.uk) for details.
Text/RE/REOptions.lhs view
@@ -5,6 +5,8 @@ {-# LANGUAGE CPP #-} #if __GLASGOW_HASKELL__ >= 800 {-# LANGUAGE TemplateHaskellQuotes #-}+{-# LANGUAGE DeriveLift #-}+{-# LANGUAGE StandaloneDeriving #-} #else {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE TemplateHaskell #-}@@ -28,7 +30,6 @@ import qualified Data.HashMap.Strict as HM import Data.Hashable import Data.String-import Language.Haskell.TH import Language.Haskell.TH.Syntax \end{code} @@ -50,12 +51,7 @@ \begin{code} -- | we need to use this in the quasi quoters to specify @SimpleREOptions@ -- selected by the quasi quoter-instance Lift SimpleREOptions where- lift sro = case sro of- MultilineSensitive -> conE 'MultilineSensitive- MultilineInsensitive -> conE 'MultilineInsensitive- BlockSensitive -> conE 'BlockSensitive- BlockInsensitive -> conE 'BlockInsensitive+deriving instance Lift SimpleREOptions \end{code} \begin{code}
Text/RE/ZeInternals/TestBench/Parsers.hs view
@@ -1,5 +1,6 @@ {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-} {-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE CPP #-} module Text.RE.ZeInternals.TestBench.Parsers (@@ -120,9 +121,12 @@ parse_time tpls = prs . unpackR where prs s = listToMaybe $ catMaybes- [ parseTime LC.defaultTimeLocale fmt s+ [ parseTimeM True LC.defaultTimeLocale fmt s | fmt<-tpls ]+#if !MIN_VERSION_time(1,5,0)+ parseTimeM _ = parseTime+#endif short_month_hm :: HM.HashMap String Int short_month_hm = HM.fromList [ (T.unpack $ shortMonthArray!i,i) | i<-[1..12] ]
Text/RE/ZeInternals/Types/Match.lhs view
@@ -1,5 +1,6 @@ \begin{code} {-# LANGUAGE RecordWildCards #-}+{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE MultiParamTypeClasses #-}
Text/RE/ZeInternals/Types/Matches.lhs view
@@ -1,5 +1,6 @@ \begin{code} {-# LANGUAGE RecordWildCards #-}+{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE MultiParamTypeClasses #-}
changelog view
@@ -1,5 +1,9 @@ -*-change-log-*- +1.1.0.1 Chris Dornan <chris.dornan@irisconnect.co.uk> 2018-12-19+ * fix for base-4.16.0.0/GHC 9.2.1+ * eliminate http-conduit dependency (currently stymied by cryptonite)+ 1.1.0.0 Chris Dornan <chris.dornan@irisconnect.co.uk> 2018-12-19 * drop support for GHC 8.0 and below * adapt for base 4.13 (MonadFail)
regex.cabal view
@@ -1,5 +1,5 @@ Name: regex-Version: 1.1.0.0+Version: 1.1.0.1 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.0+ Tag: 1.1.0.1 @@ -132,7 +132,7 @@ , hashable >= 1.2 , regex-base >= 0.93 , regex-pcre-builtin >= 0.94- , regex-tdfa >= 1.2+ , regex-tdfa >= 1.3.1.0 , template-haskell >= 2.7 , text >= 1.2 , time >= 1.4.2