Skip to content

Commit 305bba8

Browse files
tzlainetzlaine
committed
Grooming.
1 parent f468d52 commit 305bba8

File tree

12 files changed

+1470
-1545
lines changed

12 files changed

+1470
-1545
lines changed

‎include/boost/parser/detail/stl_interfaces/iterator_interface.hpp‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,9 @@ namespace boost::parser::detail { namespace stl_interfaces {
4747
`T`. */
4848
template<typename T>
4949
#if defined(BOOST_STL_INTERFACES_DOXYGEN) || BOOST_PARSER_USE_CONCEPTS
50-
// clang-format off
5150
requires std::is_object_v<T>
5251
#endif
5352
struct proxy_arrow_result
54-
// clang-format on
5553
{
5654
constexpr proxy_arrow_result(T const & value) noexcept(
5755
noexcept(T(value))) :
@@ -619,33 +617,25 @@ namespace boost::parser::detail { namespace stl_interfaces { BOOST_PARSER_DETAIL
619617
using iter_concept_t = typename iter_concept<Iterator>::type;
620618

621619
template<typename D, typename DifferenceType>
622-
// clang-format off
623-
concept plus_eq = requires (D d) { d += DifferenceType(1); };
624-
// clang-format on
620+
concept plus_eq = requires(D d) { d += DifferenceType(1); };
625621

626622
template<typename D, typename D2 = D>
627-
// clang-format off
628623
concept base_3way =
629624
#if defined(__cpp_impl_three_way_comparison)
630-
requires (D d, D2 d2) { access::base(d) <=> access::base(d2); };
625+
requires(D d, D2 d2) { access::base(d) <=> access::base(d2); };
631626
#else
632627
false;
633628
#endif
634-
// clang-format on
635629

636630
template<typename D1, typename D2 = D1>
637-
// clang-format off
638631
concept base_eq =
639-
requires (D1 d1, D2 d2) { access::base(d1) == access::base(d2); };
640-
// clang-format on
632+
requires(D1 d1, D2 d2) { access::base(d1) == access::base(d2); };
641633

642634
template<typename D, typename D2 = D>
643-
// clang-format off
644-
concept iter_sub = requires (D d, D2 d2) {
635+
concept iter_sub = requires(D d, D2 d2) {
645636
typename D::difference_type;
646-
{d - d2} -> std::convertible_to<typename D::difference_type>;
637+
{ d - d2 } -> std::convertible_to<typename D::difference_type>;
647638
};
648-
// clang-format on
649639

650640
// This iterator concept -> category mapping scheme follows the one
651641
// from zip_transform_view; see

‎include/boost/parser/detail/stl_interfaces/view_adaptor.hpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -328,23 +328,20 @@ namespace boost::parser::detail { namespace stl_interfaces {
328328
{
329329
constexpr adaptor(F f) : f_(f) {}
330330

331-
// clang-format off
332331
template<typename... Args>
333332
constexpr auto operator()(Args &&... args) const
334-
// clang-format on
335333
{
336334
#if BOOST_PARSER_DETAIL_STL_INTERFACES_USE_CONCEPTS
337335
if constexpr (std::is_invocable_v<F const &, Args...>) {
338-
return f_((Args &&) args...);
336+
return f_((Args &&)args...);
339337
} else {
340-
return closure(
341-
stl_interfaces::bind_back(f_, (Args &&) args...));
338+
return closure(stl_interfaces::bind_back(f_, (Args &&)args...));
342339
}
343340
#else
344341
return detail::adaptor_impl<
345342
F const &,
346343
detail::is_invocable_v<F const &, Args...>,
347-
Args...>::call(f_, (Args &&) args...);
344+
Args...>::call(f_, (Args &&)args...);
348345
#endif
349346
}
350347

‎include/boost/parser/detail/text/concepts.hpp‎

Lines changed: 25 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,14 @@ namespace boost::parser::detail { namespace text { BOOST_PARSER_DETAIL_TEXT_NAME
9797

9898
template<typename T>
9999
concept grapheme_iter =
100-
// clang-format off
101-
std::input_iterator<T> &&
102-
code_point_range<std::iter_reference_t<T>> &&
100+
std::input_iterator<T> && code_point_range<std::iter_reference_t<T>> &&
103101
requires(T t) {
104-
{ t.base() } -> code_point_iter;
105-
// clang-format on
106-
};
102+
{ t.base() } -> code_point_iter;
103+
};
107104

108105
template<typename T>
109106
concept grapheme_range = std::ranges::input_range<T> &&
110-
grapheme_iter<std::ranges::iterator_t<T>>;
107+
grapheme_iter<std::ranges::iterator_t<T>>;
111108

112109
template<typename R>
113110
using code_point_iterator_t = decltype(std::declval<R>().begin().base());
@@ -116,75 +113,63 @@ namespace boost::parser::detail { namespace text { BOOST_PARSER_DETAIL_TEXT_NAME
116113
using code_point_sentinel_t = decltype(std::declval<R>().end().base());
117114

118115
template<typename T, format F>
119-
concept grapheme_iter_code_unit =
120-
// clang-format off
121-
grapheme_iter<T> &&
122-
requires(T t) {
116+
concept grapheme_iter_code_unit = grapheme_iter<T> && requires(T t) {
123117
{ t.base().base() } -> code_unit_iter<F>;
124-
// clang-format on
125118
};
126119

127120
template<typename T, format F>
128-
concept grapheme_range_code_unit = grapheme_range<T> &&
121+
concept grapheme_range_code_unit =
122+
grapheme_range<T> &&
129123
grapheme_iter_code_unit<std::ranges::iterator_t<T>, F>;
130124

131125

132126
namespace dtl {
133127
template<typename T, class CodeUnit>
134128
concept eraseable_insertable_sized_bidi_range =
135-
// clang-format off
136-
std::ranges::sized_range<T> &&
137-
std::ranges::input_range<T> &&
129+
std::ranges::sized_range<T> && std::ranges::input_range<T> &&
138130
requires(T t, CodeUnit const * it) {
139-
{ t.erase(t.begin(), t.end()) } ->
140-
std::same_as<std::ranges::iterator_t<T>>;
141-
{ t.insert(t.end(), it, it) } ->
142-
std::same_as<std::ranges::iterator_t<T>>;
131+
{
132+
t.erase(t.begin(), t.end())
133+
} -> std::same_as<std::ranges::iterator_t<T>>;
134+
{
135+
t.insert(t.end(), it, it)
136+
} -> std::same_as<std::ranges::iterator_t<T>>;
143137
};
144-
// clang-format on
145138
}
146139

147140
template<typename T>
148-
concept utf8_string =
149-
// clang-format off
150-
utf8_code_unit<std::ranges::range_value_t<T>> &&
151-
dtl::eraseable_insertable_sized_bidi_range<
152-
T, std::ranges::range_value_t<T>>;
153-
// clang-format on
141+
concept utf8_string = utf8_code_unit<std::ranges::range_value_t<T>> &&
142+
dtl::eraseable_insertable_sized_bidi_range<
143+
T,
144+
std::ranges::range_value_t<T>>;
154145

155146
template<typename T>
156-
concept utf16_string =
157-
// clang-format off
158-
utf16_code_unit<std::ranges::range_value_t<T>> &&
159-
dtl::eraseable_insertable_sized_bidi_range<
160-
T, std::ranges::range_value_t<T>>;
161-
// clang-format on
147+
concept utf16_string = utf16_code_unit<std::ranges::range_value_t<T>> &&
148+
dtl::eraseable_insertable_sized_bidi_range<
149+
T,
150+
std::ranges::range_value_t<T>>;
162151

163152
template<typename T>
164153
concept utf_string = utf8_string<T> || utf16_string<T>;
165154

166155
template<typename T>
167-
// clang-format off
168-
concept transcoding_error_handler = requires(T t, std::string_view msg) {
156+
concept transcoding_error_handler = requires(T t, std::string_view msg) {
169157
{ t(msg) } -> std::same_as<char32_t>;
170-
// clang-format on
171158
};
172159
//]
173160

174161
// Clang 13 defines __cpp_lib_concepts but not std::indirectly copyable.
175162
#if defined(__clang_major__) && __clang_major__ <= 13
176163
template<typename In, typename Out>
177-
// clang-format off
178164
concept indirectly_copyable =
179165
std::indirectly_readable<In> &&
180166
std::indirectly_writable<Out, std::iter_reference_t<In>>;
181-
// clang-format on
182167
#else
183168
template<typename In, typename Out>
184169
concept indirectly_copyable = std::indirectly_copyable<In, Out>;
185170
#endif
186-
187-
}}}
171+
}
172+
}}
188173

189174
#endif
190175

‎include/boost/parser/detail/text/detail/algorithm.hpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,10 @@ namespace boost::parser::detail { namespace text { namespace detail {
5151
// that is comparable with T's interator type.
5252
template<typename T>
5353
concept cp_sentinel_gr_rng =
54-
// clang-format off
55-
grapheme_range<T> &&
56-
!grapheme_iter<sentinel_t<T>> &&
54+
grapheme_range<T> && !grapheme_iter<sentinel_t<T>> &&
5755
requires(iterator_t<T> first, sentinel_t<T> last) {
58-
{ first.base() == last } -> std::convertible_to<bool>;
59-
// clang-format on
60-
};
56+
{ first.base() == last } -> std::convertible_to<bool>;
57+
};
6158

6259
template<typename T>
6360
using gr_rng_cp_iter_t = decltype(std::declval<iterator_t<T>>().base());

‎include/boost/parser/detail/text/transcode_iterator.hpp‎

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2350,11 +2350,9 @@ namespace boost::parser::detail { namespace text { BOOST_PARSER_DETAIL_TEXT_NAME
23502350
}
23512351

23522352
template<typename Cont>
2353-
// clang-format off
23542353
requires requires { typename Cont::value_type; } &&
2355-
utf_code_unit<typename Cont::value_type>
2354+
utf_code_unit<typename Cont::value_type>
23562355
constexpr auto from_utf8_inserter(Cont & c, typename Cont::iterator it)
2357-
// clang-format on
23582356
{
23592357
if constexpr (sizeof(typename Cont::value_type) == 1) {
23602358
return std::insert_iterator<Cont>(c, it);
@@ -2366,11 +2364,9 @@ namespace boost::parser::detail { namespace text { BOOST_PARSER_DETAIL_TEXT_NAME
23662364
}
23672365

23682366
template<typename Cont>
2369-
// clang-format off
23702367
requires requires { typename Cont::value_type; } &&
2371-
utf_code_unit<typename Cont::value_type>
2368+
utf_code_unit<typename Cont::value_type>
23722369
constexpr auto from_utf16_inserter(Cont & c, typename Cont::iterator it)
2373-
// clang-format on
23742370
{
23752371
if constexpr (sizeof(typename Cont::value_type) == 1) {
23762372
return utf_16_to_8_insert_iterator<Cont>(c, it);
@@ -2382,11 +2378,9 @@ namespace boost::parser::detail { namespace text { BOOST_PARSER_DETAIL_TEXT_NAME
23822378
}
23832379

23842380
template<typename Cont>
2385-
// clang-format off
23862381
requires requires { typename Cont::value_type; } &&
2387-
utf_code_unit<typename Cont::value_type>
2382+
utf_code_unit<typename Cont::value_type>
23882383
constexpr auto from_utf32_inserter(Cont & c, typename Cont::iterator it)
2389-
// clang-format on
23902384
{
23912385
if constexpr (sizeof(typename Cont::value_type) == 1) {
23922386
return utf_32_to_8_insert_iterator<Cont>(c, it);
@@ -2398,11 +2392,9 @@ namespace boost::parser::detail { namespace text { BOOST_PARSER_DETAIL_TEXT_NAME
23982392
}
23992393

24002394
template<typename Cont>
2401-
// clang-format off
24022395
requires requires { typename Cont::value_type; } &&
2403-
utf_code_unit<typename Cont::value_type>
2396+
utf_code_unit<typename Cont::value_type>
24042397
constexpr auto from_utf8_back_inserter(Cont & c)
2405-
// clang-format on
24062398
{
24072399
if constexpr (sizeof(typename Cont::value_type) == 1) {
24082400
return std::back_insert_iterator<Cont>(c);
@@ -2414,11 +2406,9 @@ namespace boost::parser::detail { namespace text { BOOST_PARSER_DETAIL_TEXT_NAME
24142406
}
24152407

24162408
template<typename Cont>
2417-
// clang-format off
24182409
requires requires { typename Cont::value_type; } &&
2419-
utf_code_unit<typename Cont::value_type>
2410+
utf_code_unit<typename Cont::value_type>
24202411
constexpr auto from_utf16_back_inserter(Cont & c)
2421-
// clang-format on
24222412
{
24232413
if constexpr (sizeof(typename Cont::value_type) == 1) {
24242414
return utf_16_to_8_back_insert_iterator<Cont>(c);
@@ -2430,11 +2420,9 @@ namespace boost::parser::detail { namespace text { BOOST_PARSER_DETAIL_TEXT_NAME
24302420
}
24312421

24322422
template<typename Cont>
2433-
// clang-format off
24342423
requires requires { typename Cont::value_type; } &&
2435-
utf_code_unit<typename Cont::value_type>
2424+
utf_code_unit<typename Cont::value_type>
24362425
constexpr auto from_utf32_back_inserter(Cont & c)
2437-
// clang-format on
24382426
{
24392427
if constexpr (sizeof(typename Cont::value_type) == 1) {
24402428
return utf_32_to_8_back_insert_iterator<Cont>(c);
@@ -2446,11 +2434,9 @@ namespace boost::parser::detail { namespace text { BOOST_PARSER_DETAIL_TEXT_NAME
24462434
}
24472435

24482436
template<typename Cont>
2449-
// clang-format off
24502437
requires requires { typename Cont::value_type; } &&
2451-
utf_code_unit<typename Cont::value_type>
2438+
utf_code_unit<typename Cont::value_type>
24522439
constexpr auto from_utf8_front_inserter(Cont & c)
2453-
// clang-format on
24542440
{
24552441
if constexpr (sizeof(typename Cont::value_type) == 1) {
24562442
return std::front_insert_iterator<Cont>(c);
@@ -2462,11 +2448,9 @@ namespace boost::parser::detail { namespace text { BOOST_PARSER_DETAIL_TEXT_NAME
24622448
}
24632449

24642450
template<typename Cont>
2465-
// clang-format off
24662451
requires requires { typename Cont::value_type; } &&
2467-
utf_code_unit<typename Cont::value_type>
2452+
utf_code_unit<typename Cont::value_type>
24682453
constexpr auto from_utf16_front_inserter(Cont & c)
2469-
// clang-format on
24702454
{
24712455
if constexpr (sizeof(typename Cont::value_type) == 1) {
24722456
return utf_16_to_8_front_insert_iterator<Cont>(c);
@@ -2478,11 +2462,9 @@ namespace boost::parser::detail { namespace text { BOOST_PARSER_DETAIL_TEXT_NAME
24782462
}
24792463

24802464
template<typename Cont>
2481-
// clang-format off
24822465
requires requires { typename Cont::value_type; } &&
2483-
utf_code_unit<typename Cont::value_type>
2466+
utf_code_unit<typename Cont::value_type>
24842467
constexpr auto from_utf32_front_inserter(Cont & c)
2485-
// clang-format on
24862468
{
24872469
if constexpr (sizeof(typename Cont::value_type) == 1) {
24882470
return utf_32_to_8_front_insert_iterator<Cont>(c);
@@ -2492,7 +2474,6 @@ namespace boost::parser::detail { namespace text { BOOST_PARSER_DETAIL_TEXT_NAME
24922474
return std::front_insert_iterator<Cont>(c);
24932475
}
24942476
}
2495-
24962477
}}}
24972478

24982479
#endif

0 commit comments

Comments
 (0)