regex-base 0.93.1 → 0.93.2

raw patch · 4 files changed

+17/−12 lines, 4 filesdep ~arraydep ~basedep ~bytestringsetup-changedPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: array, base, bytestring, containers

API changes (from Hackage documentation)

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b ()

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllMatches (Array Int) (MatchOffset, MatchLength))

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllMatches (Array Int) MatchArray)

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllMatches [] (MatchOffset, MatchLength))

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllSubmatches [] (MatchOffset, MatchLength))

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllTextMatches (Array Int) (Array Int b))

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllTextMatches (Array Int) (MatchText b))

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllTextMatches (Array Int) [b])

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllTextMatches (Array Int) b)

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllTextMatches [] (Array Int b))

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllTextMatches [] b)

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllTextSubmatches (Array Int) (b, (MatchOffset, MatchLength)))

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllTextSubmatches (Array Int) b)

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllTextSubmatches [] (b, (MatchOffset, MatchLength)))

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (AllTextSubmatches [] b)

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (MatchOffset, MatchLength)

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (MatchResult b)

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (b, MatchText b, b)

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (b, b, b)

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b (b, b, b, [b])

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b Bool

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b Int

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b MatchArray

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b [MatchArray]

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b [MatchText b]

- Text.Regex.Base.Context: instance (RegexLike a b) => RegexContext a b [[b]]

- Text.Regex.Base.RegexLike: getAllMatches :: AllMatches f b -> (f b)

- Text.Regex.Base.RegexLike: getAllSubmatches :: AllSubmatches f b -> (f b)

- Text.Regex.Base.RegexLike: getAllTextMatches :: AllTextMatches f b -> (f b)

- Text.Regex.Base.RegexLike: getAllTextSubmatches :: AllTextSubmatches f b -> (f b)

- Text.Regex.Base.RegexLike: instance Extract (Seq a)

- Text.Regex.Base.RegexLike: instance Extract ByteString

- Text.Regex.Base.RegexLike: instance Extract String

- Text.Regex.Base.RegexLike: mrAfter :: MatchResult a -> a

- Text.Regex.Base.RegexLike: mrBefore :: MatchResult a -> a

- Text.Regex.Base.RegexLike: mrMatch :: MatchResult a -> a

- Text.Regex.Base.RegexLike: mrSubList :: MatchResult a -> [a]

- Text.Regex.Base.RegexLike: mrSubs :: MatchResult a -> Array Int a

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b ()

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.AllMatches (GHC.Arr.Array GHC.Types.Int) (Text.Regex.Base.RegexLike.MatchOffset, Text.Regex.Base.RegexLike.MatchLength))

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.AllMatches [] (Text.Regex.Base.RegexLike.MatchOffset, Text.Regex.Base.RegexLike.MatchLength))

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.AllSubmatches [] (Text.Regex.Base.RegexLike.MatchOffset, Text.Regex.Base.RegexLike.MatchLength))

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.AllTextMatches (GHC.Arr.Array GHC.Types.Int) (GHC.Arr.Array GHC.Types.Int b))

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.AllTextMatches (GHC.Arr.Array GHC.Types.Int) [b])

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.AllTextMatches (GHC.Arr.Array GHC.Types.Int) b)

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.AllTextMatches [] (GHC.Arr.Array GHC.Types.Int b))

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.AllTextMatches [] b)

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.AllTextSubmatches (GHC.Arr.Array GHC.Types.Int) (b, (Text.Regex.Base.RegexLike.MatchOffset, Text.Regex.Base.RegexLike.MatchLength)))

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.AllTextSubmatches (GHC.Arr.Array GHC.Types.Int) b)

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.AllTextSubmatches [] (b, (Text.Regex.Base.RegexLike.MatchOffset, Text.Regex.Base.RegexLike.MatchLength)))

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.AllTextSubmatches [] b)

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.MatchOffset, Text.Regex.Base.RegexLike.MatchLength)

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (Text.Regex.Base.RegexLike.MatchResult b)

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (b, Text.Regex.Base.RegexLike.MatchText b, b)

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (b, b, b)

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b (b, b, b, [b])

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b GHC.Types.Bool

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b GHC.Types.Int

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b Text.Regex.Base.RegexLike.MatchArray

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b [Text.Regex.Base.RegexLike.MatchArray]

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b [Text.Regex.Base.RegexLike.MatchText b]

+ Text.Regex.Base.Context: instance Text.Regex.Base.RegexLike.RegexLike a b => Text.Regex.Base.RegexLike.RegexContext a b [[b]]

+ Text.Regex.Base.RegexLike: [getAllMatches] :: AllMatches f b -> f b

+ Text.Regex.Base.RegexLike: [getAllSubmatches] :: AllSubmatches f b -> f b

+ Text.Regex.Base.RegexLike: [getAllTextMatches] :: AllTextMatches f b -> f b

+ Text.Regex.Base.RegexLike: [getAllTextSubmatches] :: AllTextSubmatches f b -> f b

+ Text.Regex.Base.RegexLike: [mrAfter] :: MatchResult a -> a

+ Text.Regex.Base.RegexLike: [mrBefore] :: MatchResult a -> a

+ Text.Regex.Base.RegexLike: [mrMatch] :: MatchResult a -> a

+ Text.Regex.Base.RegexLike: [mrSubList] :: MatchResult a -> [a]

+ Text.Regex.Base.RegexLike: [mrSubs] :: MatchResult a -> Array Int a

+ Text.Regex.Base.RegexLike: instance Text.Regex.Base.RegexLike.Extract (Data.Sequence.Internal.Seq a)

+ Text.Regex.Base.RegexLike: instance Text.Regex.Base.RegexLike.Extract Data.ByteString.Internal.ByteString

+ Text.Regex.Base.RegexLike: instance Text.Regex.Base.RegexLike.Extract Data.ByteString.Lazy.Internal.ByteString

+ Text.Regex.Base.RegexLike: instance Text.Regex.Base.RegexLike.Extract GHC.Base.String

- Text.Regex.Base.Impl: polymatch :: (RegexLike a b) => a -> b -> b

+ Text.Regex.Base.Impl: polymatch :: RegexLike a b => a -> b -> b

- Text.Regex.Base.RegexLike: AllMatches :: (f b) -> AllMatches f b

+ Text.Regex.Base.RegexLike: AllMatches :: f b -> AllMatches f b

- Text.Regex.Base.RegexLike: AllSubmatches :: (f b) -> AllSubmatches f b

+ Text.Regex.Base.RegexLike: AllSubmatches :: f b -> AllSubmatches f b

- Text.Regex.Base.RegexLike: AllTextMatches :: (f b) -> AllTextMatches f b

+ Text.Regex.Base.RegexLike: AllTextMatches :: f b -> AllTextMatches f b

- Text.Regex.Base.RegexLike: AllTextSubmatches :: (f b) -> AllTextSubmatches f b

+ Text.Regex.Base.RegexLike: AllTextSubmatches :: f b -> AllTextSubmatches f b

- Text.Regex.Base.RegexLike: after :: (Extract source) => Int -> source -> source

+ Text.Regex.Base.RegexLike: after :: Extract source => Int -> source -> source

- Text.Regex.Base.RegexLike: before :: (Extract source) => Int -> source -> source

+ Text.Regex.Base.RegexLike: before :: Extract source => Int -> source -> source

- Text.Regex.Base.RegexLike: blankCompOpt :: (RegexOptions regex compOpt execOpt) => compOpt

+ Text.Regex.Base.RegexLike: blankCompOpt :: RegexOptions regex compOpt execOpt => compOpt

- Text.Regex.Base.RegexLike: blankExecOpt :: (RegexOptions regex compOpt execOpt) => execOpt

+ Text.Regex.Base.RegexLike: blankExecOpt :: RegexOptions regex compOpt execOpt => execOpt

- Text.Regex.Base.RegexLike: defaultCompOpt :: (RegexOptions regex compOpt execOpt) => compOpt

+ Text.Regex.Base.RegexLike: defaultCompOpt :: RegexOptions regex compOpt execOpt => compOpt

- Text.Regex.Base.RegexLike: defaultExecOpt :: (RegexOptions regex compOpt execOpt) => execOpt

+ Text.Regex.Base.RegexLike: defaultExecOpt :: RegexOptions regex compOpt execOpt => execOpt

- Text.Regex.Base.RegexLike: empty :: (Extract source) => source

+ Text.Regex.Base.RegexLike: empty :: Extract source => source

- Text.Regex.Base.RegexLike: extract :: (Extract source) => (Int, Int) -> source -> source

+ Text.Regex.Base.RegexLike: extract :: Extract source => (Int, Int) -> source -> source

- Text.Regex.Base.RegexLike: getExecOpts :: (RegexOptions regex compOpt execOpt) => regex -> execOpt

+ Text.Regex.Base.RegexLike: getExecOpts :: RegexOptions regex compOpt execOpt => regex -> execOpt

- Text.Regex.Base.RegexLike: makeRegex :: (RegexMaker regex compOpt execOpt source) => source -> regex

+ Text.Regex.Base.RegexLike: makeRegex :: RegexMaker regex compOpt execOpt source => source -> regex

- Text.Regex.Base.RegexLike: makeRegexOpts :: (RegexMaker regex compOpt execOpt source) => compOpt -> execOpt -> source -> regex

+ Text.Regex.Base.RegexLike: makeRegexOpts :: RegexMaker regex compOpt execOpt source => compOpt -> execOpt -> source -> regex

- Text.Regex.Base.RegexLike: match :: (RegexContext regex source target) => regex -> source -> target

+ Text.Regex.Base.RegexLike: match :: RegexContext regex source target => regex -> source -> target

- Text.Regex.Base.RegexLike: matchAll :: (RegexLike regex source) => regex -> source -> [MatchArray]

+ Text.Regex.Base.RegexLike: matchAll :: RegexLike regex source => regex -> source -> [MatchArray]

- Text.Regex.Base.RegexLike: matchAllText :: (RegexLike regex source) => regex -> source -> [MatchText source]

+ Text.Regex.Base.RegexLike: matchAllText :: RegexLike regex source => regex -> source -> [MatchText source]

- Text.Regex.Base.RegexLike: matchCount :: (RegexLike regex source) => regex -> source -> Int

+ Text.Regex.Base.RegexLike: matchCount :: RegexLike regex source => regex -> source -> Int

- Text.Regex.Base.RegexLike: matchOnce :: (RegexLike regex source) => regex -> source -> Maybe MatchArray

+ Text.Regex.Base.RegexLike: matchOnce :: RegexLike regex source => regex -> source -> Maybe MatchArray

- Text.Regex.Base.RegexLike: matchOnceText :: (RegexLike regex source) => regex -> source -> Maybe (source, MatchText source, source)

+ Text.Regex.Base.RegexLike: matchOnceText :: RegexLike regex source => regex -> source -> Maybe (source, MatchText source, source)

- Text.Regex.Base.RegexLike: matchTest :: (RegexLike regex source) => regex -> source -> Bool

+ Text.Regex.Base.RegexLike: matchTest :: RegexLike regex source => regex -> source -> Bool

- Text.Regex.Base.RegexLike: setExecOpts :: (RegexOptions regex compOpt execOpt) => execOpt -> regex -> regex

+ Text.Regex.Base.RegexLike: setExecOpts :: RegexOptions regex compOpt execOpt => execOpt -> regex -> regex

Files

Setup.hs +1/−5
Text/Regex/Base.hs +1/−1
Text/Regex/Base/Context.hs +1/−1
regex-base.cabal +14/−5

Setup.hs view

@@ -1,6 +1,2 @@-#!/usr/bin/env runhaskell---- I usually compile this with "ghc --make -o setup Setup.hs"--import Distribution.Simple(defaultMain)+import Distribution.Simple main = defaultMain

Text/Regex/Base.hs view

@@ -51,6 +51,6 @@  getVersion_Text_Regex_Base :: Version getVersion_Text_Regex_Base =-  Version { versionBranch = [0,93,1]+  Version { versionBranch = [0,93,2]           , versionTags = ["unstable"]           }

Text/Regex/Base/Context.hs view

@@ -188,7 +188,7 @@  import Control.Monad(liftM) import Data.Array(Array,(!),elems,listArray)-import Data.Maybe(maybe)+--  import Data.Maybe(maybe) import Text.Regex.Base.RegexLike(RegexLike(..),RegexContext(..)   ,AllSubmatches(..),AllTextSubmatches(..),AllMatches(..),AllTextMatches(..)   ,MatchResult(..),Extract(empty),MatchOffset,MatchLength,MatchArray,MatchText)

regex-base.cabal view

@@ -1,6 +1,6 @@ Name:                   regex-base -- Keep the version below in sync with ./Text/Regex/Base.hs value getVersion_Text_Regex_Base :: Version-Version:                0.93.1+Version:                0.93.2 Cabal-Version:          >=1.2 License:                BSD3 License-File:           LICENSE@@ -14,15 +14,24 @@ Description:            Interface API for regex-posix,pcre,parsec,tdfa,dfa Category:               Text Tested-With:            GHC+build-type:             Simple+flag newBase+  description: Choose base >= 4+  default: True flag splitBase   description: Choose the new smaller, split-up base package.+  default: True library-  if flag(splitBase)-    Build-Depends:      base >= 3.0, mtl, containers, bytestring, array+  if flag(newBase)+    Build-Depends:      base >=4 && < 5, mtl, containers, bytestring, array     Extensions:         MultiParamTypeClasses, FunctionalDependencies, TypeSynonymInstances, FlexibleInstances, FlexibleContexts   else-    Build-Depends:      base < 3.0, mtl-    Extensions:         MultiParamTypeClasses, FunctionalDependencies+    if flag(splitBase)+      Build-Depends:      base >= 3.0, mtl, containers, bytestring, array+      Extensions:         MultiParamTypeClasses, FunctionalDependencies, TypeSynonymInstances, FlexibleInstances, FlexibleContexts+    else+      Build-Depends:      base < 3.0, mtl+      Extensions:         MultiParamTypeClasses, FunctionalDependencies   -- Data-Files:   -- Extra-Source-Files:   -- Extra-Tmp-Files: