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

Make the parsing of minutes optional under the flag %z

Browse Source
This commit is contained in:
Howard Hinnant
2018-03-03 11:54:48 -05:00
parent afe61df277
commit 0bde4ba8c8
1 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
include/date/date.h
View File

@@ -6771,11 +6771,46 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
{ {
int H, M; int H, M;
if (modified == CharT{}) if (modified == CharT{})
read(is, rs{H, 2, 2}, ru{M, 2, 2}); {
else read(is, rs{H, 2, 2});
read(is, rs{H, 1, 2}, CharT{':'}, ru{M, 2, 2});
if (!is.fail()) if (!is.fail())
temp_offset = hours{ H } + minutes{ H < 0 ? -M : M }; temp_offset = hours{H};
if (is.good())
{
auto ic = is.peek();
if (!Traits::eq_int_type(ic, Traits::eof()))
{
auto c = static_cast<char>(Traits::to_char_type(ic));
if ('0' <= c && c <= '9')
{
read(is, ru{M, 2, 2});
if (!is.fail())
temp_offset += minutes{ H < 0 ? -M : M };
}
}
}
}
else
{
read(is, rs{H, 1, 2});
if (!is.fail())
temp_offset = hours{H};
if (is.good())
{
auto ic = is.peek();
if (!Traits::eq_int_type(ic, Traits::eof()))
{
auto c = static_cast<char>(Traits::to_char_type(ic));
if (c == ':')
{
(void)is.get();
read(is, ru{M, 2, 2});
if (!is.fail())
temp_offset += minutes{ H < 0 ? -M : M };
}
}
}
}
command = nullptr; command = nullptr;
width = -1; width = -1;
modified = CharT{}; modified = CharT{};