diff --git a/date.h b/date.h index 36091bc..6ca38c4 100644 --- a/date.h +++ b/date.h @@ -4128,8 +4128,17 @@ to_stream(std::basic_ostream& os, const CharT* fmt, detail::save_stream _(os); os.fill('0'); os.flags(std::ios::dec | std::ios::right); - os.width(2); - os << y/100; + if (y >= 0) + { + os.width(2); + os << y/100; + } + else + { + os << CharT{'-'}; + os.width(2); + os << -(y-99)/100; + } } else { diff --git a/test/date_test/format/century.pass.cpp b/test/date_test/format/century.pass.cpp new file mode 100644 index 0000000..1daf264 --- /dev/null +++ b/test/date_test/format/century.pass.cpp @@ -0,0 +1,125 @@ +// The MIT License (MIT) +// +// Copyright (c) 2016 Howard Hinnant +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +#include "date.h" + +#include +#include +#include + +using fortnights = std::chrono::duration, + date::weeks::period>>; + +using microfortnights = std::chrono::duration>; + +int +main() +{ + using namespace date; + using namespace std::chrono; + std::ostringstream os; + os << format("%C", sys_days{jun/1/20001}); + assert(os.str() == "200"); + + os.str(""); + os << format("%C", sys_days{jun/1/20000}); + assert(os.str() == "200"); + + os.str(""); + os << format("%C", sys_days{jun/1/19999}); + assert(os.str() == "199"); + + os.str(""); + os << format("%C", sys_days{jun/1/2001}); + assert(os.str() == "20"); + + os.str(""); + os << format("%C", sys_days{jun/1/2000}); + assert(os.str() == "20"); + + os.str(""); + os << format("%C", sys_days{jun/1/1999}); + assert(os.str() == "19"); + + os.str(""); + os << format("%C", sys_days{jun/1/101}); + assert(os.str() == "01"); + + os.str(""); + os << format("%C", sys_days{jun/1/100}); + assert(os.str() == "01"); + + os.str(""); + os << format("%C", sys_days{jun/1/99}); + assert(os.str() == "00"); + + os.str(""); + os << format("%C", sys_days{jun/1/1}); + assert(os.str() == "00"); + + os.str(""); + os << format("%C", sys_days{jun/1/0}); + assert(os.str() == "00"); + + os.str(""); + os << format("%C", sys_days{jun/1/-1}); + assert(os.str() == "-01"); + + os.str(""); + os << format("%C", sys_days{jun/1/-99}); + assert(os.str() == "-01"); + + os.str(""); + os << format("%C", sys_days{jun/1/-100}); + assert(os.str() == "-01"); + + os.str(""); + os << format("%C", sys_days{jun/1/-101}); + assert(os.str() == "-02"); + + os.str(""); + os << format("%C", sys_days{jun/1/-1999}); + assert(os.str() == "-20"); + + os.str(""); + os << format("%C", sys_days{jun/1/-2000}); + assert(os.str() == "-20"); + + os.str(""); + os << format("%C", sys_days{jun/1/-2001}); + assert(os.str() == "-21"); + + os.str(""); + os << format("%C", sys_days{jun/1/-19999}); + assert(os.str() == "-200"); + + os.str(""); + os << format("%C", sys_days{jun/1/-20000}); + assert(os.str() == "-200"); + + os.str(""); + os << format("%C", sys_days{jun/1/-20001}); + assert(os.str() == "-201"); +} diff --git a/test/date_test/format/range.pass.cpp b/test/date_test/format/range.pass.cpp index 04beb4f..e6e5296 100644 --- a/test/date_test/format/range.pass.cpp +++ b/test/date_test/format/range.pass.cpp @@ -1,6 +1,6 @@ // The MIT License (MIT) // -// Copyright (c) 2015, 2016 Howard Hinnant +// Copyright (c) 2016 Howard Hinnant // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -34,8 +34,6 @@ using microfortnights = std::chrono::duration>; -#include - int main() { @@ -69,6 +67,4 @@ main() os.str(""); os << format("%F %T", sys_days{dec/last/year::max()} + microfortnights{1}); assert(os.str() == "32767-12-31 00:00:01.2096"); - os.str(""); - os.str(""); }