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

fix the regexpr version fix, we really do require 0.5.1

Browse Source
This commit is contained in:
Simon Michael 2008-12-16 18:35:46 +00:00
parent acbb669bcc
commit 3699343318
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Ledger/Utils.hs
View File

@ -36,7 +36,7 @@ import Debug.Trace
import Test.HUnit
import Text.Printf
import Text.Regex
import Text.RegexPR hiding (gsubRegexPRBy)
import Text.RegexPR
import Text.ParserCombinators.Parsec
@ -120,14 +120,6 @@ containsRegex r s = case matchRegex r s of
Just _ -> True
otherwise -> False
-- regexpr-0.5.1 includes this now, keep a little longer to minimise installation pain
-- | Replace all occurrences of a regexp in string using the given replacement function
gsubRegexPRBy :: String -> (String -> String) -> String -> String
gsubRegexPRBy pat f str =
case (matchRegexPR pat str) of
Just ((match, (before,after)), _) -> before ++ f match ++ gsubRegexPRBy pat f after
Nothing -> str
-- lists

2
hledger.cabal
View File

@ -19,7 +19,7 @@ Extra-Tmp-Files:
Cabal-Version: >= 1.2
Executable hledger
Build-Depends: base, containers, haskell98, directory, parsec, regex-compat, regexpr,
Build-Depends: base, containers, haskell98, directory, parsec, regex-compat, regexpr>=0.5.1,
old-locale, time, HUnit, vty==3.1.2, mtl, bytestring
Main-Is: hledger.hs
Other-Modules: