Skip to content

Commit dff7d3e

Browse files
huixie90Hui Xie
huixie90
authored and
Hui Xie
committed
[libc++] implement std::flat_multimap
fix byte include
1 parent 26d832c commit dff7d3e

File tree

94 files changed

+10095
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+10095
-4
lines changed

‎libcxx/docs/FeatureTestMacroTable.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,10 @@ Status
330330
---------------------------------------------------------- -----------------
331331
``__cpp_lib_expected`` ``202211L``
332332
---------------------------------------------------------- -----------------
333+
``__cpp_lib_flat_map`` ``202207L``
334+
---------------------------------------------------------- -----------------
335+
``__cpp_lib_flat_set`` *unimplemented*
336+
---------------------------------------------------------- -----------------
333337
``__cpp_lib_format_ranges`` ``202207L``
334338
---------------------------------------------------------- -----------------
335339
``__cpp_lib_formatters`` *unimplemented*

‎libcxx/docs/Status/Cxx23Papers.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"`P2443R1 <https://wg21.link/P2443R1>`__","``views::chunk_by``","2022-02 (Virtual)","|Complete|","18",""
5353
"","","","","",""
5454
"`P0009R18 <https://wg21.link/P0009R18>`__","mdspan: A Non-Owning Multidimensional Array Reference","2022-07 (Virtual)","|Complete|","18",""
55-
"`P0429R9 <https://wg21.link/P0429R9>`__","A Standard ``flat_map``","2022-07 (Virtual)","|In progress|","",""
55+
"`P0429R9 <https://wg21.link/P0429R9>`__","A Standard ``flat_map``","2022-07 (Virtual)","|Complete|","",""
5656
"`P1169R4 <https://wg21.link/P1169R4>`__","``static operator()``","2022-07 (Virtual)","|Complete|","16",""
5757
"`P1222R4 <https://wg21.link/P1222R4>`__","A Standard ``flat_set``","2022-07 (Virtual)","","",""
5858
"`P1223R5 <https://wg21.link/P1223R5>`__","``ranges::find_last()``, ``ranges::find_last_if()``, and ``ranges::find_last_if_not()``","2022-07 (Virtual)","|Complete|","19",""

‎libcxx/include/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,10 @@ set(files
358358
__filesystem/space_info.h
359359
__filesystem/u8path.h
360360
__flat_map/flat_map.h
361+
__flat_map/flat_multimap.h
361362
__flat_map/key_value_iterator.h
362363
__flat_map/sorted_unique.h
364+
__flat_map/sorted_equivalent.h
363365
__format/buffer.h
364366
__format/concepts.h
365367
__format/container_adaptor.h

‎libcxx/include/__flat_map/flat_multimap.h‎

Lines changed: 1060 additions & 0 deletions
Large diffs are not rendered by default.

‎libcxx/include/__flat_map/sorted_equivalent.h‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// -*- C++ -*-
2+
//===----------------------------------------------------------------------===//
3+
//
4+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5+
// See https://llvm.org/LICENSE.txt for license information.
6+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7+
//
8+
//===----------------------------------------------------------------------===//
9+
#ifndef _LIBCPP___FLAT_MAP_SORTED_EQUIVALENT_H
10+
#define _LIBCPP___FLAT_MAP_SORTED_EQUIVALENT_H
11+
12+
#include <__config>
13+
14+
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15+
# pragma GCC system_header
16+
#endif
17+
18+
#if _LIBCPP_STD_VER >= 23
19+
20+
_LIBCPP_BEGIN_NAMESPACE_STD
21+
22+
struct sorted_equivalent_t {
23+
explicit sorted_equivalent_t() = default;
24+
};
25+
inline constexpr sorted_equivalent_t sorted_equivalent{};
26+
27+
_LIBCPP_END_NAMESPACE_STD
28+
29+
#endif // _LIBCPP_STD_VER >= 23
30+
31+
#endif // _LIBCPP___FLAT_MAP_SORTED_EQUIVALENT_H

‎libcxx/include/flat_map‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,34 @@ namespace std {
3535
class Predicate>
3636
typename flat_map<Key, T, Compare, KeyContainer, MappedContainer>::size_type
3737
erase_if(flat_map<Key, T, Compare, KeyContainer, MappedContainer>& c, Predicate pred);
38+
39+
// [flat.multimap], class template flat_multimap
40+
template<class Key, class T, class Compare = less<Key>,
41+
class KeyContainer = vector<Key>, class MappedContainer = vector<T>>
42+
class flat_multimap;
43+
44+
struct sorted_equivalent_t { explicit sorted_equivalent_t() = default; };
45+
inline constexpr sorted_equivalent_t sorted_equivalent{};
46+
47+
template<class Key, class T, class Compare, class KeyContainer, class MappedContainer,
48+
class Allocator>
49+
struct uses_allocator<flat_multimap<Key, T, Compare, KeyContainer, MappedContainer>,
50+
Allocator>;
51+
52+
// [flat.multimap.erasure], erasure for flat_multimap
53+
template<class Key, class T, class Compare, class KeyContainer, class MappedContainer,
54+
class Predicate>
55+
typename flat_multimap<Key, T, Compare, KeyContainer, MappedContainer>::size_type
56+
erase_if(flat_multimap<Key, T, Compare, KeyContainer, MappedContainer>& c, Predicate pred);
3857
*/
3958

4059
#include <__assert> // all public C++ headers provide the assertion handler
4160
#include <__config>
4261
#include <__flat_map/flat_map.h>
62+
#include <__flat_map/flat_multimap.h>
4363
#include <__flat_map/key_value_iterator.h>
4464
#include <__flat_map/sorted_unique.h>
65+
#include <__flat_map/sorted_equivalent.h>
4566
#include <version>
4667

4768
// standard required includes

‎libcxx/include/module.modulemap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,8 +1229,10 @@ module std [system] {
12291229

12301230
module flat_map {
12311231
module flat_map { header "__flat_map/flat_map.h" }
1232+
module flat_multimap { header "__flat_map/flat_multimap.h" }
12321233
module key_value_iterator { header "__flat_map/key_value_iterator.h" }
12331234
module sorted_unique { header "__flat_map/sorted_unique.h" }
1235+
module sorted_equivalent { header "__flat_map/sorted_equivalent.h" }
12341236

12351237
header "flat_map"
12361238
export *

‎libcxx/include/version‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ __cpp_lib_execution 201902L <execution>
101101
201603L // C++17
102102
__cpp_lib_expected 202211L <expected>
103103
__cpp_lib_filesystem 201703L <filesystem>
104+
__cpp_lib_flat_map 202207L <flat_map>
105+
__cpp_lib_flat_set 202207L <flat_set>
104106
__cpp_lib_format 202110L <format>
105107
__cpp_lib_format_path 202403L <filesystem>
106108
__cpp_lib_format_ranges 202207L <format>
@@ -476,6 +478,8 @@ __cpp_lib_void_t 201411L <type_traits>
476478
# define __cpp_lib_constexpr_typeinfo 202106L
477479
# define __cpp_lib_containers_ranges 202202L
478480
# define __cpp_lib_expected 202211L
481+
# define __cpp_lib_flat_map 202207L
482+
// # define __cpp_lib_flat_set 202207L
479483
# define __cpp_lib_format_ranges 202207L
480484
// # define __cpp_lib_formatters 202302L
481485
# define __cpp_lib_forward_like 202207L

‎libcxx/modules/std/flat_map.inc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,12 @@ export namespace std {
2020
// [flat.map.erasure], erasure for flat_map
2121
using std::erase_if;
2222

23-
#endif // _LIBCPP_STD_VER >= 23
24-
#if 0
2523
// [flat.multimap], class template flat_multimap
2624
using std::flat_multimap;
2725

2826
using std::sorted_equivalent;
2927
using std::sorted_equivalent_t;
3028

3129
// [flat.multimap.erasure], erasure for flat_multimap
32-
#endif
30+
#endif // _LIBCPP_STD_VER >= 23
3331
} // namespace std

‎libcxx/test/std/containers/container.adaptors/flat.map.syn/sorted_equivalent.pass.cpp‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
//===----------------------------------------------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
10+
11+
// <flat_map>
12+
13+
// struct sorted_equivalent_t { explicit sorted_equivalent_t() = default; };
14+
// inline constexpr sorted_equivalent_t sorted_equivalent{};
15+
16+
#include <cassert>
17+
#include <concepts>
18+
#include <flat_map>
19+
#include <type_traits>
20+
21+
template <class T>
22+
void implicit_test(T) {}
23+
24+
template <class T>
25+
concept HasImplicitDefaultCtor = requires { implicit_test<T>({}); };
26+
27+
static_assert(std::is_default_constructible_v<std::sorted_equivalent_t>);
28+
static_assert(std::is_trivially_default_constructible_v<std::sorted_equivalent_t>);
29+
static_assert(!HasImplicitDefaultCtor<std::sorted_equivalent_t>);
30+
31+
constexpr bool test() {
32+
{
33+
[[maybe_unused]] std::sorted_equivalent_t s;
34+
}
35+
{
36+
[[maybe_unused]] std::same_as<const std::sorted_equivalent_t&> decltype(auto) s = (std::sorted_equivalent);
37+
}
38+
{
39+
[[maybe_unused]] std::same_as<const std::sorted_equivalent_t> decltype(auto) copy = std::sorted_equivalent;
40+
}
41+
42+
return true;
43+
}
44+
45+
int main(int, char**) {
46+
test();
47+
static_assert(test());
48+
49+
return 0;
50+
}

0 commit comments

Comments
 (0)