From bfedf367c40ce4b2f2c6de9b82627a6ef8595d1c Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 24 Oct 2014 14:30:49 -0700
Subject: [PATCH] export Regexp types, disambiguate CsvReader's

---
 hledger-lib/Hledger/Read/CsvReader.hs | 8 ++++----
 hledger-lib/Hledger/Utils/Regex.hs    | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/hledger-lib/Hledger/Read/CsvReader.hs b/hledger-lib/Hledger/Read/CsvReader.hs
index c9567ea20..f8000d800 100644
--- a/hledger-lib/Hledger/Read/CsvReader.hs
+++ b/hledger-lib/Hledger/Read/CsvReader.hs
@@ -286,10 +286,10 @@ type CsvFieldIndex    = Int
 type JournalFieldName = String
 type FieldTemplate    = String
 type ConditionalBlock = ([RecordMatcher], [(JournalFieldName, FieldTemplate)]) -- block matches if all RecordMatchers match
-type RecordMatcher    = [Regexp] -- match if any regexps match any of the csv fields
--- type FieldMatcher     = (CsvFieldName, [Regexp]) -- match if any regexps match this csv field
+type RecordMatcher    = [RegexpPattern] -- match if any regexps match any of the csv fields
+-- type FieldMatcher     = (CsvFieldName, [RegexpPattern]) -- match if any regexps match this csv field
 type DateFormat       = String
-type Regexp           = String
+type RegexpPattern           = String
 
 rules = CsvRules {
   rdirectives=[],
@@ -657,7 +657,7 @@ getEffectiveAssignment rules record f = lastMay $ assignmentsFor f
                 -- matcherMatches pats = any patternMatches pats
                 matcherMatches pats = patternMatches $  "(" ++ intercalate "|" pats ++ ")"
                   where
-                    patternMatches :: Regexp -> Bool
+                    patternMatches :: RegexpPattern -> Bool
                     patternMatches pat = regexMatchesCI pat csvline
                       where
                         csvline = intercalate "," record
diff --git a/hledger-lib/Hledger/Utils/Regex.hs b/hledger-lib/Hledger/Utils/Regex.hs
index 61c4d9a38..cf22a29cf 100644
--- a/hledger-lib/Hledger/Utils/Regex.hs
+++ b/hledger-lib/Hledger/Utils/Regex.hs
@@ -22,9 +22,11 @@ Easy regular expression helpers, based on regex-tdfa and regexpr. These should
 -}
 
 module Hledger.Utils.Regex (
-  --  regexMatch
+   Regexp
+  ,Replacement
+  -- ,regexMatch
   -- ,regexMatchCI
-   regexMatches
+  ,regexMatches
   ,regexMatchesCI
   ,containsRegex
   ,regexReplace