-
Notifications
You must be signed in to change notification settings - Fork 1.6k
<chrono>: [time.duration.io] output #1341
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Stephan T. Lavavej (StephanTLavavej)
merged 9 commits into
microsoft:master
from
MattStephanson:chrono-duration-output
Nov 6, 2020
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
97097f6
<chrono>: [time.duration.io] output
MattStephanson 35db89a
Add C++20 guard
MattStephanson b200915
Apply suggestions from code review
MattStephanson 14a7e8d
Suggestions from code review
MattStephanson ca416bd
Reorganize test code into single source file
MattStephanson 05f67ac
Don't need to undef the macro that I deleted
MattStephanson 56abf19
Merge branch 'master' into gh1341_chrono_output
StephanTLavavej 0a19f92
Code review feedback.
StephanTLavavej 87a12a7
Rework the literal unit suffix table.
StephanTLavavej File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # Copyright (c) Microsoft Corporation. | ||
| # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
|
|
||
| RUNALL_INCLUDE ..\usual_latest_matrix.lst |
125 changes: 125 additions & 0 deletions
125
tests/std/tests/P0355R7_calendars_and_time_zones_io/test.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
|
|
||
| #include <cassert> | ||
| #include <chrono> | ||
| #include <climits> | ||
| #include <locale> | ||
| #include <ratio> | ||
| #include <sstream> | ||
| #include <string> | ||
| #include <utility> | ||
|
|
||
| using namespace std; | ||
| using chrono::duration; | ||
|
|
||
| template <class CharT, class Rep, class Period> | ||
| bool test_duration_basic_out(const duration<Rep, Period>& d, const CharT* expected) { | ||
| basic_ostringstream<CharT> ss; | ||
|
|
||
| ss << d; | ||
| return ss.str() == expected; | ||
| } | ||
|
|
||
| #define WIDEN(TYPE, STR) get<const TYPE*>(make_pair(STR, L##STR)); | ||
|
StephanTLavavej marked this conversation as resolved.
|
||
|
|
||
| template <class CharT> | ||
| bool test_duration_locale_out() { | ||
| basic_stringstream<CharT> ss; | ||
| const duration<double> d{0.140625}; | ||
| ss.precision(3); | ||
| ss << d; | ||
| ss.setf(ios_base::scientific, ios_base::floatfield); | ||
| ss << ' ' << d; | ||
|
|
||
| basic_string<CharT> expected = WIDEN(CharT, "0.141s 1.406e-01s"); | ||
|
StephanTLavavej marked this conversation as resolved.
|
||
|
|
||
| #ifdef _DEBUG | ||
| #define DEFAULT_IDL_SETTING 2 | ||
| #else | ||
| #define DEFAULT_IDL_SETTING 0 | ||
| #endif | ||
|
|
||
| #if !defined(_DLL) || _ITERATOR_DEBUG_LEVEL == DEFAULT_IDL_SETTING | ||
| // When linking dynamically, user-defined facets are incompatible with non-default _ITERATOR_DEBUG_LEVEL settings. | ||
| struct comma : numpunct<CharT> { | ||
| CharT do_decimal_point() const { | ||
| return ','; | ||
| } | ||
| }; | ||
|
|
||
| ss.imbue(locale(ss.getloc(), new comma)); | ||
| ss << ' ' << d; | ||
| expected += WIDEN(CharT, " 1,406e-01s"); | ||
| #endif // !defined(_DLL) || _ITERATOR_DEBUG_LEVEL == DEFAULT_IDL_SETTING | ||
|
|
||
| return ss.str() == expected; | ||
| } | ||
|
|
||
| #undef WIDEN | ||
|
|
||
| void test_duration_output() { | ||
| using LongRatio = ratio<INTMAX_MAX - 1, INTMAX_MAX>; | ||
|
StephanTLavavej marked this conversation as resolved.
|
||
| assert(test_duration_basic_out(duration<int, atto>{1}, "1as")); | ||
| assert(test_duration_basic_out(duration<int, femto>{2}, "2fs")); | ||
| assert(test_duration_basic_out(duration<int, pico>{3}, "3ps")); | ||
| assert(test_duration_basic_out(duration<int, nano>{42}, "42ns")); | ||
| assert(test_duration_basic_out(duration<int, micro>{42}, "42us")); | ||
| assert(test_duration_basic_out(duration<int, milli>{42}, "42ms")); | ||
| assert(test_duration_basic_out(duration<int, centi>{42}, "42cs")); | ||
| assert(test_duration_basic_out(duration<int, deci>{42}, "42ds")); | ||
| assert(test_duration_basic_out(duration<int, ratio<1>>{42}, "42s")); | ||
| assert(test_duration_basic_out(duration<int, deca>{42}, "42das")); | ||
| assert(test_duration_basic_out(duration<int, hecto>{42}, "42hs")); | ||
| assert(test_duration_basic_out(duration<int, kilo>{42}, "42ks")); | ||
| assert(test_duration_basic_out(duration<int, mega>{42}, "42Ms")); | ||
| assert(test_duration_basic_out(duration<int, giga>{42}, "42Gs")); | ||
| assert(test_duration_basic_out(duration<int, tera>{42}, "42Ts")); | ||
| assert(test_duration_basic_out(duration<int, peta>{42}, "42Ps")); | ||
| assert(test_duration_basic_out(duration<int, exa>{42}, "42Es")); | ||
| assert(test_duration_basic_out(duration<int, ratio<60>>{42}, "42min")); | ||
| assert(test_duration_basic_out(duration<int, ratio<60 * 60>>{42}, "42h")); | ||
| assert(test_duration_basic_out(duration<int, ratio<60 * 60 * 24>>{42}, "42d")); | ||
|
|
||
| assert(test_duration_basic_out(duration<int, ratio<2>>{24}, "24[2]s")); | ||
| assert(test_duration_basic_out(duration<int, ratio<1, 2>>{24}, "24[1/2]s")); | ||
| assert(test_duration_basic_out(duration<int, ratio<22, 7>>{24}, "24[22/7]s")); | ||
| assert(test_duration_basic_out(duration<int, LongRatio>{24}, "24[9223372036854775806/9223372036854775807]s")); | ||
|
|
||
| assert(test_duration_basic_out(duration<double>{0.140625}, "0.140625s")); | ||
| assert(test_duration_locale_out<char>()); | ||
|
|
||
| assert(test_duration_basic_out(duration<int, atto>{1}, L"1as")); | ||
| assert(test_duration_basic_out(duration<int, femto>{2}, L"2fs")); | ||
| assert(test_duration_basic_out(duration<int, pico>{3}, L"3ps")); | ||
| assert(test_duration_basic_out(duration<int, nano>{42}, L"42ns")); | ||
| assert(test_duration_basic_out(duration<int, micro>{42}, L"42us")); | ||
| assert(test_duration_basic_out(duration<int, milli>{42}, "42ms")); | ||
| assert(test_duration_basic_out(duration<int, centi>{42}, L"42cs")); | ||
| assert(test_duration_basic_out(duration<int, deci>{42}, L"42ds")); | ||
| assert(test_duration_basic_out(duration<int, ratio<1>>{42}, L"42s")); | ||
| assert(test_duration_basic_out(duration<int, deca>{42}, L"42das")); | ||
| assert(test_duration_basic_out(duration<int, hecto>{42}, L"42hs")); | ||
| assert(test_duration_basic_out(duration<int, kilo>{42}, L"42ks")); | ||
| assert(test_duration_basic_out(duration<int, mega>{42}, L"42Ms")); | ||
| assert(test_duration_basic_out(duration<int, giga>{42}, L"42Gs")); | ||
| assert(test_duration_basic_out(duration<int, tera>{42}, L"42Ts")); | ||
| assert(test_duration_basic_out(duration<int, peta>{42}, L"42Ps")); | ||
| assert(test_duration_basic_out(duration<int, exa>{42}, L"42Es")); | ||
| assert(test_duration_basic_out(duration<int, ratio<60>>{42}, L"42min")); | ||
| assert(test_duration_basic_out(duration<int, ratio<60 * 60>>{42}, L"42h")); | ||
| assert(test_duration_basic_out(duration<int, ratio<60 * 60 * 24>>{42}, L"42d")); | ||
|
|
||
| assert(test_duration_basic_out(duration<int, ratio<2>>{24}, L"24[2]s")); | ||
| assert(test_duration_basic_out(duration<int, ratio<1, 2>>{24}, L"24[1/2]s")); | ||
| assert(test_duration_basic_out(duration<int, ratio<22, 7>>{24}, L"24[22/7]s")); | ||
| assert(test_duration_basic_out(duration<int, LongRatio>{24}, L"24[9223372036854775806/9223372036854775807]s")); | ||
|
|
||
| assert(test_duration_basic_out(duration<double>{0.140625}, L"0.140625s")); | ||
| assert(test_duration_locale_out<wchar_t>()); | ||
| } | ||
|
|
||
| int main() { | ||
| test_duration_output(); | ||
| return 0; | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.