From 7f2ffe2e45e689a6f028f9dc23bee5dafa24f867 Mon Sep 17 00:00:00 2001
From: Clint Adams <clint@debian.org>
Date: Sat, 28 Dec 2013 13:31:58 -0500
Subject: [PATCH] Use regex-tdfa instead of regex-compat-tdfa

---
 hledger-lib/Hledger/Utils.hs  | 6 +++---
 hledger-lib/hledger-lib.cabal | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hledger-lib/Hledger/Utils.hs b/hledger-lib/Hledger/Utils.hs
index 5e86b62bf..8114ec754 100644
--- a/hledger-lib/Hledger/Utils.hs
+++ b/hledger-lib/Hledger/Utils.hs
@@ -51,7 +51,7 @@ import System.IO.Unsafe (unsafePerformIO)
 import Test.HUnit
 import Text.ParserCombinators.Parsec
 import Text.Printf
-import Text.Regex
+import Text.Regex.TDFA
 import Text.RegexPR
 import Text.Show.Pretty
 -- import qualified Data.Map as Map
@@ -246,10 +246,10 @@ regexSplit = splitRegexPR
 
 -- regex-compat (regex-posix) functions that perform better than regexpr.
 regexMatchesRegexCompat :: String -> String -> Bool
-regexMatchesRegexCompat r = isJust . matchRegex (mkRegex r)
+regexMatchesRegexCompat = flip (=~)
 
 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
 
diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal
index 6886f0302..c9b5f9352 100644
--- a/hledger-lib/hledger-lib.cabal
+++ b/hledger-lib/hledger-lib.cabal
@@ -68,7 +68,7 @@ library
                  ,old-time
                  ,parsec
                  ,pretty-show
-                 ,regex-compat-tdfa == 0.95.*
+                 ,regex-tdfa
                  ,regexpr >= 0.5.1
                  ,safe >= 0.2
                  ,split >= 0.1 && < 0.3
@@ -100,7 +100,7 @@ test-suite tests
                , old-time
                , parsec
                , pretty-show
-               , regex-compat-tdfa
+               , regex-tdfa
                , regexpr
                , safe
                , split