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

cli: parse date2: correctly (#222)

Browse Source
This commit is contained in:
Simon Michael 2014-12-16 11:06:21 -08:00
parent 663e1f5ba9
commit 77c2c90290
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,7 +208,7 @@ prefixes = map (++":") [
,"desc" ,"desc"
,"acct" ,"acct"
,"date" ,"date"
,"edate" ,"date2"
,"status" ,"status"
,"cur" ,"cur"
,"real" ,"real"
@ -240,12 +240,12 @@ parseQueryTerm d ('n':'o':'t':':':s) = case parseQueryTerm d s of
parseQueryTerm _ ('c':'o':'d':'e':':':s) = Left $ Code s parseQueryTerm _ ('c':'o':'d':'e':':':s) = Left $ Code s
parseQueryTerm _ ('d':'e':'s':'c':':':s) = Left $ Desc s parseQueryTerm _ ('d':'e':'s':'c':':':s) = Left $ Desc s
parseQueryTerm _ ('a':'c':'c':'t':':':s) = Left $ Acct s parseQueryTerm _ ('a':'c':'c':'t':':':s) = Left $ Acct s
parseQueryTerm d ('d':'a':'t':'e':'2':':':s) =
case parsePeriodExpr d s of Left e -> error' $ "\"date2:"++s++"\" gave a "++showDateParseError e
Right (_,span) -> Left $ Date2 span
parseQueryTerm d ('d':'a':'t':'e':':':s) = parseQueryTerm d ('d':'a':'t':'e':':':s) =
case parsePeriodExpr d s of Left e -> error' $ "\"date:"++s++"\" gave a "++showDateParseError e case parsePeriodExpr d s of Left e -> error' $ "\"date:"++s++"\" gave a "++showDateParseError e
Right (_,span) -> Left $ Date span Right (_,span) -> Left $ Date span
parseQueryTerm d ('e':'d':'a':'t':'e':':':s) =
case parsePeriodExpr d s of Left e -> error' $ "\"date:"++s++"\" gave a "++showDateParseError e
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 ord q where (ord, q) = parseAmountQueryTerm s parseQueryTerm _ ('a':'m':'t':':':s) = Left $ Amt ord q where (ord, q) = parseAmountQueryTerm s

2
hledger-lib/Hledger/Reports/BalanceReport.hs
View File

@ -177,7 +177,7 @@ tests_balanceReport =
(defreportopts{query_="date:'in 2009'"}, samplejournal2) `gives` (defreportopts{query_="date:'in 2009'"}, samplejournal2) `gives`
([], ([],
Mixed [nullamt]) Mixed [nullamt])
(defreportopts{query_="edate:'in 2009'"}, samplejournal2) `gives` (defreportopts{query_="date2:'in 2009'"}, samplejournal2) `gives`
([ ([
(("assets:bank:checking","assets:bank:checking",0),mamountp' "$1.00") (("assets:bank:checking","assets:bank:checking",0),mamountp' "$1.00")
,(("income:salary","income:salary",0),mamountp' "$-1.00") ,(("income:salary","income:salary",0),mamountp' "$-1.00")

2
hledger-lib/Hledger/Reports/ReportOptions.hs
View File

@ -285,7 +285,7 @@ tests_queryFromOpts = [
,query_="date:'to 2013'" ,query_="date:'to 2013'"
}) })
assertEqual "" (Date2 $ mkdatespan "2012/01/01" "2013/01/01") assertEqual "" (Date2 $ mkdatespan "2012/01/01" "2013/01/01")
(queryFromOpts nulldate defreportopts{query_="edate:'in 2012'"}) (queryFromOpts nulldate defreportopts{query_="date2:'in 2012'"})
assertEqual "" (Or [Acct "a a", Acct "'b"]) assertEqual "" (Or [Acct "a a", Acct "'b"])
(queryFromOpts nulldate defreportopts{query_="'a a' 'b"}) (queryFromOpts nulldate defreportopts{query_="'a a' 'b"})
] ]