HowardHinnant/date
1
0
Fork 1
mirror of https://github.com/HowardHinnant/date.git synced 2025-08-03 20:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow duplicate parsing into the same fields

Browse Source 
* as long as all duplicates produce consistent results.
This commit is contained in:
Howard Hinnant
2018-04-07 21:42:00 -04:00
parent 1d9e49ea21
commit cdb4b276d9
1 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
include/date/date.h
View File

@@ -7058,23 +7058,26 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
} }
if (G != not_a_year) if (G != not_a_year)
{ {
// Convert G, V and wd to Y, m and d // If V and wd are available, convert G, V and wd to Y, m and d
if (V == not_a_week_num || wd == not_a_weekday) year_month_day ymd;
goto broken; bool full = V != not_a_week_num && wd != not_a_weekday;
auto ymd = year_month_day{local_days(year{G-1}/dec/thu[last]) + if (full)
ymd = year_month_day{local_days(year{G-1}/dec/thu[last]) +
(mon-thu) + weeks{V-1} + (mon-thu) + weeks{V-1} +
(weekday{static_cast<unsigned>(wd)}-mon)}; (weekday{static_cast<unsigned>(wd)}-mon)};
else
ymd = year{G}/0/0;
if (Y == not_a_year) if (Y == not_a_year)
Y = static_cast<int>(ymd.year()); Y = static_cast<int>(ymd.year());
else if (year{Y} != ymd.year()) else if (year{Y} != ymd.year())
goto broken; goto broken;
if (m == 0) if (m == 0)
m = static_cast<int>(static_cast<unsigned>(ymd.month())); m = static_cast<int>(static_cast<unsigned>(ymd.month()));
else if (month(static_cast<unsigned>(m)) != ymd.month()) else if (full && month(static_cast<unsigned>(m)) != ymd.month())
goto broken; goto broken;
if (d == 0) if (d == 0)
d = static_cast<int>(static_cast<unsigned>(ymd.day())); d = static_cast<int>(static_cast<unsigned>(ymd.day()));
else if (day(static_cast<unsigned>(d)) != ymd.day()) else if (full && day(static_cast<unsigned>(d)) != ymd.day())
goto broken; goto broken;
} }
if (j != 0 && Y != not_a_year) if (j != 0 && Y != not_a_year)
@@ -7091,47 +7094,53 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
} }
if (U != not_a_week_num && Y != not_a_year) if (U != not_a_week_num && Y != not_a_year)
{ {
if (wd == not_a_weekday) if (wd != not_a_weekday)
goto broken; {
sys_days sd; year_month_day ymd = sys_days(year{Y}/jan/sun[1]) + weeks{U-1} +
if (U == 0) (weekday{static_cast<unsigned>(wd)} - sun);
sd = year{Y-1}/dec/weekday{static_cast<unsigned>(wd)}[last]; if (year{Y} != ymd.year())
goto broken;
if (m == 0)
m = static_cast<int>(static_cast<unsigned>(ymd.month()));
else if (month(static_cast<unsigned>(m)) != ymd.month())
goto broken;
if (d == 0)
d = static_cast<int>(static_cast<unsigned>(ymd.day()));
else if (day(static_cast<unsigned>(d)) != ymd.day())
goto broken;
}
else else
sd = sys_days(year{Y}/jan/sun[1]) + weeks{U-1} + {
(weekday{static_cast<unsigned>(wd)} - sun); if (floor<weeks>(sys_days(year{Y}/m/d) -
year_month_day ymd = sd; sys_days(Sunday[1]/January/year{Y})) +
if (year{Y} != ymd.year()) weeks{1} != weeks{U})
goto broken; goto broken;
if (m == 0) }
m = static_cast<int>(static_cast<unsigned>(ymd.month()));
else if (month(static_cast<unsigned>(m)) != ymd.month())
goto broken;
if (d == 0)
d = static_cast<int>(static_cast<unsigned>(ymd.day()));
else if (day(static_cast<unsigned>(d)) != ymd.day())
goto broken;
} }
if (W != not_a_week_num && Y != not_a_year) if (W != not_a_week_num && Y != not_a_year)
{ {
if (wd == not_a_weekday) if (wd != not_a_weekday)
goto broken; {
sys_days sd; year_month_day ymd = sys_days(year{Y}/jan/mon[1]) + weeks{W-1} +
if (W == 0) (weekday{static_cast<unsigned>(wd)} - mon);
sd = year{Y-1}/dec/weekday{static_cast<unsigned>(wd)}[last]; if (year{Y} != ymd.year())
goto broken;
if (m == 0)
m = static_cast<int>(static_cast<unsigned>(ymd.month()));
else if (month(static_cast<unsigned>(m)) != ymd.month())
goto broken;
if (d == 0)
d = static_cast<int>(static_cast<unsigned>(ymd.day()));
else if (day(static_cast<unsigned>(d)) != ymd.day())
goto broken;
}
else else
sd = sys_days(year{Y}/jan/mon[1]) + weeks{W-1} + {
(weekday{static_cast<unsigned>(wd)} - mon); if (floor<weeks>(sys_days(year{Y}/m/d) -
year_month_day ymd = sd; sys_days(Monday[1]/January/year{Y})) +
if (year{Y} != ymd.year()) weeks{1} != weeks{W})
goto broken; goto broken;
if (m == 0) }
m = static_cast<int>(static_cast<unsigned>(ymd.month()));
else if (month(static_cast<unsigned>(m)) != ymd.month())
goto broken;
if (d == 0)
d = static_cast<int>(static_cast<unsigned>(ymd.day()));
else if (day(static_cast<unsigned>(d)) != ymd.day())
goto broken;
} }
if (Y < static_cast<int>(year::min()) || Y > static_cast<int>(year::max())) if (Y < static_cast<int>(year::min()) || Y > static_cast<int>(year::max()))
Y = not_a_year; Y = not_a_year;