Merging format #1821

barcharcraz · 2021-04-10T04:06:32Z

adds an implementation of <format>
Resolves P0645R10 <format> Text Formatting #30.
Resolves <format>: Avoid dependency on <variant> #1826.

feature/format: Merge VS 2019 16.8 Preview 1 toolset update

feature/format: Merge Standard_D16as_v4 VM update

feature/format: Merge VS 2019 16.8 Preview 2 toolset update

Merge master into feature/format.

feature/format: Merge toolset update

… classes (microsoft#1232) * add format header * add tests to build * add format_arg_value and custom_value. * more format parser * parse align * fill/align parsing tests. * arg_id and width * tests for arg_id, quite basic right now * correct a spelling error * add <format> to other required files * resolve some review comments * respond to review comments * start conversion to string_view * some tests for width * enable wchar_t * constexprify tests. * tests for non-parsing is todo * forgot a bit of named args that needed removal. * remove a requires clause and use brief syntax. * newlines * use concepts_matrix. * some review comments were hiding from me * fix wchar_t misparse bug * Apply suggestions from code review Co-authored-by: Casey Carter <cartec69@gmail.com> * Apply suggestions from code review Co-authored-by: Casey Carter <cartec69@gmail.com> * move test coverage todo * more review comments * fix test string numbering * comment on narrowing test case * fix minor issues Co-authored-by: Charles Barto <barto.charlie@gmail.com> Co-authored-by: Casey Carter <cartec69@gmail.com>

Hand-correct trivial conflict in `tests/std/tests.lst` due to the addition of tests at the same place in both branches.

feature/format: Merge CI update to pick up microsoft#1337. There was a minor merge conflict in `test/std/test.lst` due to the addition of tests on both branches.

* add parse_precision. * adopt style review comments. * add more tests for exceptions. * test constexpr precision too * address some more review comments Co-authored-by: Charles Barto <barto.charlie@gmail.com>

feature/format: Merge toolset update

* add parse_precision. * adopt style review comments. * add parse format spec * add tests for parse_format_specs * actually call the test functions. * fix tests. * test the return value of _Parse_format_specs * added more tests for parse_format_specs. * address review comments. * make "we're not done yet" a precondition for _Parse_align. * remove test that voilates new preconditions on _Parse_align. Co-authored-by: Charles Barto <barto.charlie@gmail.com>

feature/format: Merge toolset update

feature/format: Merge CI update

Merge master into feature/format

feature/format: Merge toolset update

feature/format: Merge LLVM update

* charconv internal functions for wchar_t buffers * fill_n for zero filling * code review feedback - actually call wide Ryu functions - Widen __[df]2s_buffered_n - Don't wrap memcpy calls. - Use ternary operator and cast for static widen. - Restore _CSTD memcpy. * Test digit pairs with a static table. Co-authored-by: Stephan T. Lavavej <stl@nuwen.net>

* Noralize next_arg_id * Add precondition check to basic_format_parse_context::advance_to and debug optimization * ensure basic_format_parse_context::check_arg_id is not a constant expression * Add tests for basic_format_parse_context * Fix constant expression check * windsdk is bad * Use a non constexpr function call with a better name Co-authored-by: S. B. Tam <cpplearner@outlook.com> * Reverse the polarity Co-authored-by: S. B. Tam <cpplearner@outlook.com> Co-authored-by: Stephan T. Lavavej <stl@nuwen.net>

Pack format_arg_store tightly. * Noralize next_arg_id * Add precondition check to basic_format_parse_context::advance_to and debug optimization * ensure basic_format_parse_context::check_arg_id is not a constant expression * Add tests for basic_format_parse_context * Fix constant expression check * Use a non constexpr function call with a better name Co-authored-by: S. B. Tam <cpplearner@outlook.com> * Create a packed _Format_arg_store * We want bits not bytes * Dont use friendship * Remove all int128 code * Who doesnt hate max/min * Copy&Paste does not like ODR * Address review comments Co-authored by: Casey Carter <cacarter@microsoft.com> * Minor fixes * Move make_format_args down * Use auto * Some more fixes * Everyone can be a wchar_t if he just believe in it * Add {unsigned} long tests * Int is in our hearts * Remove duplication * Move _CharType alias into function to unblock the build * First round of review comments * Use variable template rather than a function * Add warning * Make a proper constructor of _Format_arg_store * Use a single contiguous array to store the `_Format_arg_store` data * Specialize empty `_Format_arg_store` * More review comments * Fix uninitialized memory * Properly initialize the first Index Co-authored-by: S. B. Tam <cpplearner@outlook.com>

feature/format: Merge toolset update

feature/format: Merge VMSS update

* add parse_precision. * adopt style review comments. * actually call the test functions. * add parse_precision. * adopt style review comments. * add parse format spec * add tests for parse_format_specs * initial commit for string_parsing * remove duplicate test frunctions * on_text and some on_format_specs * add basic_format_specs and the formatter dispatcher. * forgot a semicolon. * now we need to do _Write... :| * more work on format checkers * add _Format_arg_type_to_enum * add char* writer * make it compile * flesh out format_args_store. * don't need overloaded * get rid of a bunch of declvals. * compile vformat (does not link) * make width and precision unsigned int internally (instead of int) * add some comments for shat the various helpery classes actually do. * formatting (heh) fixes. * uncomment and fix requirement for _Parse_replacement_field_callbacks * don't write out the entire format string when encountering a replacement field. * resolve some code review comments * fix merge artifacts, convert from _Type to _Basic_format_arg_type * address code review comments * alphabatize test.lst * static_cast<unsigned int>(0) instead of unsigned{} * remove dead _STL_INTERNAL_CHECK and find in the correct range Co-authored-by: Charles Barto <barto.charlie@gmail.com>

* add tests for various escaped curlies and simple text. * better comment in _Parse_format_string Co-authored-by: Casey Carter <cartec69@gmail.com>

…icrosoft#1675) * intial replacement field tests (and numeric arg indexing)

StephanTLavavej · 2021-04-14T22:43:52Z

I've pushed a merge with main to resolve a conflict with #1832 in <xutility>: that PR added _Rewrap_iterator above _Convertible_from which this PR is moving. I resolved it by leaving _Rewrap_iterator in place (now immediately above in_in_result) so only _Convertible_from is moving. This is fine because nothing in <xutility> itself needs _Rewrap_iterator.

…nto merging_format

tests/std/tests/P0645R10_text_formatting_formatting/test.cpp

StephanTLavavej · 2021-04-15T07:31:59Z

Thanks to everyone who worked on implementing this major feature! 🎉 😻 🚀

Sixshaman · 2021-04-15T07:34:17Z

Thank you everyone! I've been waiting for that

CaseyCarter · 2021-04-15T17:43:04Z

Belated approval: everything looks acceptable to me (which is no great surprise, since I've reviewed most of this already, and worked on some of it).

StephanTLavavej and others added 30 commits August 9, 2020 19:10

Merge pull request microsoft#1177 from microsoft/master

7f4bbce

feature/format: Merge VS 2019 16.8 Preview 1 toolset update

Merge pull request microsoft#1187 from microsoft/master

1125262

feature/format: Merge Standard_D16as_v4 VM update

Merge pull request microsoft#1235 from microsoft/master

2021528

feature/format: Merge VS 2019 16.8 Preview 2 toolset update

Merge pull request microsoft#1279 from microsoft/master

db81914

Merge master into feature/format.

Merge pull request microsoft#1297 from microsoft/master

5ec6ff6

feature/format: Merge toolset update

Merge branch 'main' into ff

7e36734

Hand-correct trivial conflict in `tests/std/tests.lst` due to the addition of tests at the same place in both branches.

Merge pull request microsoft#1361 from CaseyCarter/feature_format_update

699a195

feature/format: Merge CI update to pick up microsoft#1337. There was a minor merge conflict in `test/std/test.lst` due to the addition of tests on both branches.

[feature/format] add parse_precision. (microsoft#1333)

0668a74

* add parse_precision. * adopt style review comments. * add more tests for exceptions. * test constexpr precision too * address some more review comments Co-authored-by: Charles Barto <barto.charlie@gmail.com>

Merge pull request microsoft#1379 from microsoft/master

8de7213

feature/format: Merge toolset update

Merge pull request microsoft#1403 from microsoft/master

5ce5928

feature/format: Merge toolset update

Merge pull request microsoft#1469 from microsoft/master

8ea4749

feature/format: Merge toolset update

Merge pull request microsoft#1525 from microsoft/master

9d7ffa8

feature/format: Merge toolset update

Merge pull request microsoft#1536 from microsoft/master

67197c1

feature/format: Merge CI update

Merge pull request microsoft#1568 from microsoft/master

1877068

Merge master into feature/format

Merge pull request microsoft#1578 from microsoft/master

b0edef8

feature/format: Merge toolset update

Merge branch 'main' into merge_format

0e595d8

Unskip format.error/format.error.pass.cpp.

3460df5

Merge pull request microsoft#1614 from StephanTLavavej/merge_format

18bbe7d

feature/format: Merge LLVM update

Merge branch 'main' into merge_format

d29bd5b

Merge pull request microsoft#1643 from StephanTLavavej/merge_format

e0ad338

feature/format: Merge toolset update

Merge branch 'main' into feature/format

0d877f8

Merge pull request microsoft#1656 from CaseyCarter/feature/format

32455b2

feature/format: Merge VMSS update

<format>: vformat_to parsing and escaping tests (microsoft#1661)

99e8a2d

* add tests for various escaped curlies and simple text. * better comment in _Parse_format_string Co-authored-by: Casey Carter <cartec69@gmail.com>

<format>: initial replacement field tests (and numeric arg indexing) (m…

62e9bbe

…icrosoft#1675) * intial replacement field tests (and numeric arg indexing)

StephanTLavavej mentioned this pull request Apr 13, 2021

<format>: Merge merging_format into feature/format #1833

Merged

barcharcraz added 2 commits April 13, 2021 15:32

move monostate.

baf1fbc

fix bad clang-format formatting.

c3a056c

StephanTLavavej approved these changes Apr 13, 2021

View reviewed changes

CaseyCarter self-assigned this Apr 14, 2021

Merge branch 'main' into merging_format

75bac5e

StephanTLavavej approved these changes Apr 14, 2021

View reviewed changes

barcharcraz added 3 commits April 14, 2021 15:48

add tests for runtime width from libfmt + bugfix from encoding PR.

14df470

Merge branch 'merging_format' of https://github.com/barcharcraz/stl i…

d62f42b

…nto merging_format

verify range in advance_to

9612cce

StephanTLavavej requested changes Apr 14, 2021

View reviewed changes

tests/std/tests/P0645R10_text_formatting_formatting/test.cpp Outdated Show resolved Hide resolved

tests/std/tests/P0645R10_text_formatting_formatting/test.cpp Outdated Show resolved Hide resolved

tests/std/tests/P0645R10_text_formatting_formatting/test.cpp Outdated Show resolved Hide resolved

_Adl_verify_range the correct range

e8496c6

StephanTLavavej approved these changes Apr 14, 2021

View reviewed changes

Fix intrinsic usage for _M_ARM64EC.

c572f7e

miscco approved these changes Apr 15, 2021

View reviewed changes

StephanTLavavej merged commit c12089e into microsoft:main Apr 15, 2021

This was referenced Apr 15, 2021

<format> assumes strings are encoded in the active code page #1834

Merged

<format>: Reserve some space in result string #1803

Merged

QuellaZhang mentioned this pull request Apr 20, 2021

[C++20][MSVC] test_houghcircles.cpp(59,27): error C2666: 'cv::format': 2 overloads have similar conversions opencv/opencv#19941

Closed

StephanTLavavej mentioned this pull request Apr 21, 2021

<chrono> Formatting: C++20's Final Boss #1870

Merged

kobykahane mentioned this pull request May 18, 2021

<chrono>: Including header pulls in a dynamic initializer, incompatible with /kernel #1926

Closed

StephanTLavavej mentioned this pull request Dec 11, 2021

Meta LWG issue: 2021-10 meeting #2236

Closed

39 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merging format #1821

Merging format #1821

barcharcraz commented Apr 10, 2021 •

edited by StephanTLavavej

Loading

StephanTLavavej commented Apr 14, 2021

StephanTLavavej commented Apr 15, 2021

Sixshaman commented Apr 15, 2021

CaseyCarter commented Apr 15, 2021

Merging format #1821

Merging format #1821

Conversation

barcharcraz commented Apr 10, 2021 • edited by StephanTLavavej Loading

StephanTLavavej commented Apr 14, 2021

StephanTLavavej commented Apr 15, 2021

Sixshaman commented Apr 15, 2021

CaseyCarter commented Apr 15, 2021

barcharcraz commented Apr 10, 2021 •

edited by StephanTLavavej

Loading