feedc0de/date
1
0
Fork 0
forked from HowardHinnant/date
Code Pull Requests Activity

Fail if you need a valid year and don't parse one.

Browse Source
This commit is contained in:
Howard Hinnant
2017-05-20 23:04:49 -04:00
parent 83c8b4d522
commit 0fb3921e5b
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
date.h
+12 -3
View File
@@ -1403,14 +1403,21 @@ year::is_leap() const NOEXCEPT
}
CONSTCD11 inline year::operator int() const NOEXCEPT {return y_;}
CONSTCD11 inline bool year::ok() const NOEXCEPT {return true;}
CONSTCD11
inline
bool
year::ok() const NOEXCEPT
{
return y_ != std::numeric_limits<short>::min();
}
CONSTCD11
inline
year
year::min() NOEXCEPT
{
return year{std::numeric_limits<short>::min()};
return year{std::numeric_limits<short>::min()+1};
}
CONSTCD11
@@ -5458,7 +5465,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
const CharT* command = nullptr;
auto modified = CharT{};
auto width = -1;
CONSTDATA int not_a_year = 33000;
CONSTDATA int not_a_year = numeric_limits<short>::min();
int Y = not_a_year;
CONSTDATA int not_a_century = not_a_year / 100;
int C = not_a_century;
@@ -6377,6 +6384,8 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, year& y,
using CT = seconds;
fields<CT> fds{};
from_stream(is, fmt, fds, abbrev, offset);
if (!fds.ymd.year().ok())
is.setstate(ios::failbit);
if (!is.fail())
y = fds.ymd.year();
}