sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correctly parse the range of period "june 2008"

Browse source
This commit is contained in:
John Wiegley 2009-06-18 00:50:27 +01:00
parent a64c249efb
commit ed9735f66d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/times.cc
View file

@ -649,15 +649,19 @@ void date_interval_t::parse(std::istream& in)
if (! end) if (! end)
end = *start + gregorian::days(1); end = *start + gregorian::days(1);
} else { } else {
bool overwrite_end = false;
if (year) { if (year) {
start = date_t(*year, 1, 1); start = date_t(*year, 1, 1);
if (! end) if (! end) {
end = *start + gregorian::years(1); end = *start + gregorian::years(1);
overwrite_end = true;
}
} }
if (mon) { if (mon) {
start = date_t(start->year(), *mon, 1); start = date_t(start->year(), *mon, 1);
if (! end) if (! end || overwrite_end)
end = *start + gregorian::months(1); end = *start + gregorian::months(1);
} }
} }