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

smart dates: make "this" optional

Browse Source
This commit is contained in:
Simon Michael 2009-01-23 02:27:56 +00:00
parent 415c48d855
commit fdc13f6f43
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Ledger/Dates.hs
View File

@ -236,7 +236,7 @@ Assumes any text in the parse stream has been lowercased.
smartdate :: GenParser Char st SmartDate smartdate :: GenParser Char st SmartDate
smartdate = do smartdate = do
let dateparsers = [yyyymmdd, ymd, ym, md, y, d, month, mon, today, yesterday, tomorrow, let dateparsers = [yyyymmdd, ymd, ym, md, y, d, month, mon, today, yesterday, tomorrow,
lastthisnextthing lastthisnextthing, thing
] ]
(y,m,d) <- choice $ map try dateparsers (y,m,d) <- choice $ map try dateparsers
return $ (y,m,d) return $ (y,m,d)
@ -339,6 +339,17 @@ lastthisnextthing = do
return ("",r,p) return ("",r,p)
thing :: GenParser Char st SmartDate
thing = do
p <- choice $ [
string "day"
,string "week"
,string "month"
,string "quarter"
,string "year"
]
return ("","this",p)
periodexpr :: Day -> GenParser Char st (Interval, DateSpan) periodexpr :: Day -> GenParser Char st (Interval, DateSpan)
periodexpr rdate = choice $ map try [ periodexpr rdate = choice $ map try [
intervalanddateperiodexpr rdate, intervalanddateperiodexpr rdate,