slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use regex-tdfa instead of regex-compat-tdfa

Browse Source
This commit is contained in:
Clint Adams 2013-12-28 13:31:58 -05:00
parent 7d9e334aa9
commit 7f2ffe2e45
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hledger-lib/Hledger/Utils.hs
View File

@ -51,7 +51,7 @@ import System.IO.Unsafe (unsafePerformIO)
import Test.HUnit import Test.HUnit
import Text.ParserCombinators.Parsec import Text.ParserCombinators.Parsec
import Text.Printf import Text.Printf
import Text.Regex import Text.Regex.TDFA
import Text.RegexPR import Text.RegexPR
import Text.Show.Pretty import Text.Show.Pretty
-- import qualified Data.Map as Map -- import qualified Data.Map as Map
@ -246,10 +246,10 @@ regexSplit = splitRegexPR
-- regex-compat (regex-posix) functions that perform better than regexpr. -- regex-compat (regex-posix) functions that perform better than regexpr.
regexMatchesRegexCompat :: String -> String -> Bool regexMatchesRegexCompat :: String -> String -> Bool
regexMatchesRegexCompat r = isJust . matchRegex (mkRegex r) regexMatchesRegexCompat = flip (=~)
regexMatchesCIRegexCompat :: String -> String -> Bool regexMatchesCIRegexCompat :: String -> String -> Bool
regexMatchesCIRegexCompat r = isJust . matchRegex (mkRegexWithOpts r True False) regexMatchesCIRegexCompat r = match (makeRegexOpts defaultCompOpt { multiline = True, caseSensitive = False, newSyntax = True } defaultExecOpt r)
-- lists -- lists

4
hledger-lib/hledger-lib.cabal
View File

@ -68,7 +68,7 @@ library
,old-time ,old-time
,parsec ,parsec
,pretty-show ,pretty-show
,regex-compat-tdfa == 0.95.* ,regex-tdfa
,regexpr >= 0.5.1 ,regexpr >= 0.5.1
,safe >= 0.2 ,safe >= 0.2
,split >= 0.1 && < 0.3 ,split >= 0.1 && < 0.3
@ -100,7 +100,7 @@ test-suite tests
, old-time , old-time
, parsec , parsec
, pretty-show , pretty-show
, regex-compat-tdfa , regex-tdfa
, regexpr , regexpr
, safe , safe
, split , split