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

refactor: rename unclear helper

Browse Source
This commit is contained in:
Simon Michael 2013-09-09 17:41:29 -07:00
parent b72d2b17b6
commit 3d205ec03f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hledger-lib/Hledger/Query.hs
View File

@ -219,7 +219,7 @@ parseQueryTerm d ('e':'d':'a':'t':'e':':':s) =
Right (_,span) -> Left $ Date2 span Right (_,span) -> Left $ Date2 span
parseQueryTerm _ ('s':'t':'a':'t':'u':'s':':':s) = Left $ Status $ parseStatus s parseQueryTerm _ ('s':'t':'a':'t':'u':'s':':':s) = Left $ Status $ parseStatus s
parseQueryTerm _ ('r':'e':'a':'l':':':s) = Left $ Real $ parseBool s parseQueryTerm _ ('r':'e':'a':'l':':':s) = Left $ Real $ parseBool s
parseQueryTerm _ ('a':'m':'t':':':s) = Left $ Amt op q where (op, q) = parseAmountTest s parseQueryTerm _ ('a':'m':'t':':':s) = Left $ Amt op q where (op, q) = parseAmountQueryTerm s
parseQueryTerm _ ('e':'m':'p':'t':'y':':':s) = Left $ Empty $ parseBool s parseQueryTerm _ ('e':'m':'p':'t':'y':':':s) = Left $ Empty $ parseBool s
parseQueryTerm _ ('d':'e':'p':'t':'h':':':s) = Left $ Depth $ readDef 0 s parseQueryTerm _ ('d':'e':'p':'t':'h':':':s) = Left $ Depth $ readDef 0 s
parseQueryTerm _ ('s':'y':'m':':':s) = Left $ Sym s parseQueryTerm _ ('s':'y':'m':':':s) = Left $ Sym s
@ -248,8 +248,8 @@ tests_parseQueryTerm = [
] ]
-- can fail -- can fail
parseAmountTest :: String -> (Ordering, Quantity) parseAmountQueryTerm :: String -> (Ordering, Quantity)
parseAmountTest s = parseAmountQueryTerm s =
case s of case s of
"" -> err "" -> err
'<':s' -> (LT, readDef err s') '<':s' -> (LT, readDef err s')
@ -259,9 +259,9 @@ parseAmountTest s =
where where
err = error' $ "could not parse as '=', '<', or '>' (optional) followed by a numeric quantity: " ++ s err = error' $ "could not parse as '=', '<', or '>' (optional) followed by a numeric quantity: " ++ s
tests_parseAmountTest = [ tests_parseAmountQueryTerm = [
"parseAmountTest" ~: do "parseAmountQueryTerm" ~: do
let s `gives` r = parseAmountTest s `is` r let s `gives` r = parseAmountQueryTerm s `is` r
"<0" `gives` (LT,0) "<0" `gives` (LT,0)
"=0.23" `gives` (EQ,0.23) "=0.23" `gives` (EQ,0.23)
"0.23" `gives` (EQ,0.23) "0.23" `gives` (EQ,0.23)
@ -615,7 +615,7 @@ tests_Hledger_Query = TestList $
++ tests_words'' ++ tests_words''
++ tests_filterQuery ++ tests_filterQuery
++ tests_parseQueryTerm ++ tests_parseQueryTerm
++ tests_parseAmountTest ++ tests_parseAmountQueryTerm
++ tests_parseQuery ++ tests_parseQuery
++ tests_matchesAccount ++ tests_matchesAccount
++ tests_matchesPosting ++ tests_matchesPosting