From 063aaf35b535d2a33150e8ba252152985435fba8 Mon Sep 17 00:00:00 2001
From: Stephen Morgan <morgan.stephen99@gmail.com>
Date: Mon, 16 Aug 2021 16:38:27 +1000
Subject: [PATCH] cln: hlint: Rename pattern variables to avoid hlint parsing
 errors.

---
 .hlint.yaml                         | 2 --
 hledger-lib/Hledger/Query.hs        | 6 +++---
 hledger-lib/Hledger/Utils/String.hs | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.hlint.yaml b/.hlint.yaml
index 455337407..27bf5a864 100644
--- a/.hlint.yaml
+++ b/.hlint.yaml
@@ -50,8 +50,6 @@
 - ignore: {name: "Use second"}
 - ignore: {name: "Use fromRight"}
 - ignore: {name: "Use fromLeft"}
-- ignore: {name: "Parse error: on input `$*'"}
-- ignore: {name: "Parse error: on input `pattern'"}
 - ignore: {name: "Redundant bang pattern"}
 - ignore: {name: "Use zipWith"}
 - ignore: {name: "Replace case with maybe"}
diff --git a/hledger-lib/Hledger/Query.hs b/hledger-lib/Hledger/Query.hs
index 05b23f07d..df0ea8921 100644
--- a/hledger-lib/Hledger/Query.hs
+++ b/hledger-lib/Hledger/Query.hs
@@ -199,7 +199,7 @@ words'' :: [T.Text] -> T.Text -> [T.Text]
 words'' prefixes = fromparse . parsewith maybeprefixedquotedphrases -- XXX
     where
       maybeprefixedquotedphrases :: SimpleTextParser [T.Text]
-      maybeprefixedquotedphrases = choice' [prefixedQuotedPattern, singleQuotedPattern, doubleQuotedPattern, pattern] `sepBy` skipNonNewlineSpaces1
+      maybeprefixedquotedphrases = choice' [prefixedQuotedPattern, singleQuotedPattern, doubleQuotedPattern, patterns] `sepBy` skipNonNewlineSpaces1
       prefixedQuotedPattern :: SimpleTextParser T.Text
       prefixedQuotedPattern = do
         not' <- fromMaybe "" `fmap` (optional $ string "not:")
@@ -214,8 +214,8 @@ words'' prefixes = fromparse . parsewith maybeprefixedquotedphrases -- XXX
       singleQuotedPattern = between (char '\'') (char '\'') (many $ noneOf ("'" :: [Char])) >>= return . stripquotes . T.pack
       doubleQuotedPattern :: SimpleTextParser T.Text
       doubleQuotedPattern = between (char '"') (char '"') (many $ noneOf ("\"" :: [Char])) >>= return . stripquotes . T.pack
-      pattern :: SimpleTextParser T.Text
-      pattern = fmap T.pack $ many (noneOf (" \n\r" :: [Char]))
+      patterns :: SimpleTextParser T.Text
+      patterns = fmap T.pack $ many (noneOf (" \n\r" :: [Char]))
 
 -- XXX
 -- keep synced with patterns below, excluding "not"
diff --git a/hledger-lib/Hledger/Utils/String.hs b/hledger-lib/Hledger/Utils/String.hs
index b447a6d3c..b597df46a 100644
--- a/hledger-lib/Hledger/Utils/String.hs
+++ b/hledger-lib/Hledger/Utils/String.hs
@@ -134,10 +134,10 @@ words' :: String -> [String]
 words' "" = []
 words' s  = map stripquotes $ fromparse $ parsewithString p s
     where
-      p = do ss <- (singleQuotedPattern <|> doubleQuotedPattern <|> pattern) `sepBy` skipNonNewlineSpaces1
+      p = do ss <- (singleQuotedPattern <|> doubleQuotedPattern <|> patterns) `sepBy` skipNonNewlineSpaces1
              -- eof
              return ss
-      pattern = many (noneOf whitespacechars)
+      patterns = many (noneOf whitespacechars)
       singleQuotedPattern = between (char '\'') (char '\'') (many $ noneOf "'")
       doubleQuotedPattern = between (char '"') (char '"') (many $ noneOf "\"")