Skip to content

[WIP] Implementation of <flat_map> #3896

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.

Sign up for GitHub

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

Jump to bottom
Merged
StephanTLavavej merged 101 commits into from
Jan 12, 2024
Merged

[WIP] Implementation of <flat_map> #3896

StephanTLavavej merged 101 commits into from
Jan 12, 2024

Conversation

@duanqn
Copy link
Contributor

@duanqn duanqn commented Jul 21, 2023 •
edited
Loading

Ongoing work -- implementation of #2910 .
Progress so far:

  • P0429R9 <flat_map>
    • flat_map: nested types
    • flat_map: constructors (as specified in P0429R9)
    • flat_map: iterator and const_iterator (iterator is now convertible to const_iterator)
    • flat_map: capacity functions
    • flat_map: iterator functions (begin, end etc.)
    • flat_map: observer functions
    • flat_map: operator == and <=>, non-member swap
    • flat_map: member functions including Access, Modifiers, Erasure and more
    • Deduction guides
    • flat_multimap
  • LWG-3884 flat_meow is missing allocator-extended copy/move constructors
  • LWG-3816 flat_map and flat_multimap should impose sequence container requirements (Note: Pure wording. No code implementation required.)
  • LWG-3786 Flat maps' deduction guides need to default Allocator to be useful
  • LWG-3803 flat_meow constructors taking KeyContainer lack KeyCompare parameter

frederick-vs-ja
frederick-vs-ja reviewed Jul 21, 2023
View reviewed changes
Copy link
Contributor

@frederick-vs-ja frederick-vs-ja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After all, clang-format needs to run for <flat_map> after changes.

stl/inc/flat_map Outdated
Comment on lines 20 to 21
struct sorted_unique_t { explicit sorted_unique_t() = default; };
inline constexpr sorted_unique_t sorted_unique {};
Copy link
Contributor

@frederick-vs-ja frederick-vs-ja Jul 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These things should be in <xmemory>. Actually, they are already provided there in the feature/flat_set branch.

Copy link
Contributor Author

@duanqn duanqn Oct 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I plan to remove this once the changes of flat_set are visible on master branch

achabense
achabense reviewed Jul 21, 2023
View reviewed changes
achabense
achabense reviewed Jul 21, 2023
View reviewed changes
AlexGuteniev
AlexGuteniev suggested changes Jul 21, 2023
View reviewed changes
Copy link
Contributor

@AlexGuteniev AlexGuteniev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

usual header stuff

achabense
achabense reviewed Jul 21, 2023
View reviewed changes
@StephanTLavavej StephanTLavavej added flat_meow C++23 container adaptors cxx23 C++23 feature labels Jul 21, 2023
frederick-vs-ja
frederick-vs-ja reviewed Jul 23, 2023
View reviewed changes
achabense
achabense reviewed Jul 25, 2023
View reviewed changes
achabense
achabense reviewed Jul 25, 2023
View reviewed changes
achabense
achabense reviewed Jul 25, 2023
View reviewed changes
achabense
achabense reviewed Jul 25, 2023
View reviewed changes
frederick-vs-ja
frederick-vs-ja reviewed Jul 28, 2023
View reviewed changes
@duanqn

This comment was marked as outdated.

Sign in to view
@duanqn

This comment was marked as outdated.

Sign in to view
duanqn
duanqn commented Aug 11, 2023
View reviewed changes
duanqn
duanqn commented Aug 11, 2023
View reviewed changes
achabense
achabense reviewed Aug 16, 2023
View reviewed changes
@duanqn

This comment was marked as outdated.

Sign in to view
frederick-vs-ja
frederick-vs-ja reviewed Sep 5, 2023
View reviewed changes
achabense
achabense reviewed Sep 5, 2023
View reviewed changes
achabense
achabense reviewed Sep 5, 2023
View reviewed changes
achabense
achabense reviewed Sep 5, 2023
View reviewed changes
achabense
achabense reviewed Sep 5, 2023
View reviewed changes
achabense
achabense reviewed Sep 5, 2023
View reviewed changes
achabense
achabense reviewed Sep 6, 2023
View reviewed changes
achabense
achabense reviewed Sep 14, 2023
View reviewed changes
duanqn and others added 19 commits December 15, 2023 15:36
@duanqn
Remove unused _Maybe_const_iterator_t
cf28719
@duanqn
Add remaining template deduction guides and specialization of std::us…
a67b9f8 
…es_allocator
@duanqn
Fix compile errors in clang-cl
a89a6ba
@duanqn
Fix SFINAE on clang; Add a simple test
562b277
@duanqn
Add more tests. 1 of the configurations is failing.
49e8bb3
@duanqn @frederick-vs-ja
Use strict test matrix
f7ef6db 
Co-authored-by: A. Jiang <de34@live.cn>
@duanqn
Add more test cases on construction
f7512d6
@duanqn
Implement LWG-3786
8b7691d
@duanqn
Add _HAS_CXX23 guard check
fddf5f2
@duanqn
Implement LWG-3803 and add tests accordingly
7284bac
@duanqn
Improve tests
1f4feec
@duanqn
Fix header test
21459c7
@duanqn
Take review comments and change the signature of _Insert_exact
1c08c84
@duanqn
Use _Ugly style
213b448
@duanqn
Use concept instead of enable_if_t
49d5dd6
@duanqn
Use _Is_transparent_v from <xmemory> instead of inventing a new concept
4e3dc8d
@duanqn
Add definition of sorted_equivalent_t
4d0d81f
@duanqn
Add definition of flat_multimap
945ef18
@duanqn
Add a test of incomplete type
aabc8ca
@StephanTLavavej StephanTLavavej changed the base branch from main to feature/flat_map January 12, 2024 05:11
@StephanTLavavej StephanTLavavej marked this pull request as ready for review January 12, 2024 05:11
@StephanTLavavej StephanTLavavej requested a review from a team as a code owner January 12, 2024 05:11
@StephanTLavavej
Copy link
Member

StephanTLavavej commented Jan 12, 2024

I've changed the "base" branch so this targets the new feature/flat_map (currently at the same commit as main), pushed a conflict-free merge with main, followed by mechanical clang-formatting and fixes to test_header_units_and_modules.hpp so the checks will pass.

I haven't otherwise reviewed the code, but this will be ready to merge as a starting point once the checks are green. Thanks again for all your hard work getting the feature this far! 😻

@StephanTLavavej StephanTLavavej merged commit 8e0f015 into microsoft:feature/flat_map Jan 12, 2024
@frederick-vs-ja frederick-vs-ja mentioned this pull request Jan 22, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

4 more reviewers

@AlexGuteniev AlexGuteniev AlexGuteniev requested changes

@frederick-vs-ja frederick-vs-ja frederick-vs-ja left review comments

@achabense achabense achabense left review comments

@grcm10 grcm10 grcm10 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cxx23 C++23 feature flat_meow C++23 container adaptors

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@duanqn @achabense @StephanTLavavej @AlexGuteniev @frederick-vs-ja @grcm10