This is an archive of the discontinued LLVM Phabricator instance.

Differential D110637

[libc++] Simplify the _LIBCPP_CONSTEXPR markings on starts_with() etc. NFCI.
ClosedPublic

Authored by • Quuxplusone on Sep 28 2021, 9:21 AM.

Details

Reviewers
ldionne
Mordante
mclow.lists
miscco
Group Reviewers
Restricted Project
Commits
rGae0e037f532b: [libc++] Simplify the _LIBCPP_CONSTEXPR markings on starts_with() etc.
Summary

This came out of review comments on D110598.

Diff Detail

Event Timeline

• Quuxplusone requested review of this revision.Sep 28 2021, 9:21 AM
• Quuxplusone created this revision.
Herald added 1 blocking reviewer(s): Restricted Project. · View Herald TranscriptSep 28 2021, 9:21 AM
Herald added a subscriber: libcxx-commits. · View Herald Transcript
• Quuxplusone mentioned this in D110598: [libc++] Implement P0980R1 (constexpr std::string).Sep 28 2021, 9:42 AM
Mordante accepted this revision as: Mordante.Sep 28 2021, 9:48 AM

Nice cleanup, LGTM!

Harbormaster completed remote builds in B126124: Diff 375609.Sep 28 2021, 10:58 AM
miscco accepted this revision.Sep 28 2021, 10:47 PM
miscco added a subscriber: miscco.

I love it

ldionne accepted this revision.Sep 29 2021, 2:48 PM
This revision is now accepted and ready to land.Sep 29 2021, 2:48 PM
Closed by commit rGae0e037f532b: [libc++] Simplify the _LIBCPP_CONSTEXPR markings on starts_with() etc. (authored by • arthur.j.odwyer). · Explain WhySep 29 2021, 4:01 PM
This revision was automatically updated to reflect the committed changes.
• arthur.j.odwyer added a commit: rGae0e037f532b: [libc++] Simplify the _LIBCPP_CONSTEXPR markings on starts_with() etc..

Revision Contents

PathSize
libcxx/
include/
24 lines
28 lines

Diff 376060

libcxx/include/string

Show First 20 Lines • Show All 1,400 Lines • ▼ Show 20 Lines inline _LIBCPP_INLINE_VISIBILITY
int int
> >
compare(size_type __pos1, size_type __n1, const _Tp& __t, size_type __pos2, size_type __n2=npos) const; compare(size_type __pos1, size_type __n1, const _Tp& __t, size_type __pos2, size_type __n2=npos) const;
int compare(const value_type* __s) const _NOEXCEPT; int compare(const value_type* __s) const _NOEXCEPT;
int compare(size_type __pos1, size_type __n1, const value_type* __s) const; int compare(size_type __pos1, size_type __n1, const value_type* __s) const;
int compare(size_type __pos1, size_type __n1, const value_type* __s, size_type __n2) const; int compare(size_type __pos1, size_type __n1, const value_type* __s, size_type __n2) const;
#if _LIBCPP_STD_VER > 17 #if _LIBCPP_STD_VER > 17
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool starts_with(__self_view __sv) const _NOEXCEPT bool starts_with(__self_view __sv) const noexcept
{ return __self_view(data(), size()).starts_with(__sv); } { return __self_view(data(), size()).starts_with(__sv); }
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool starts_with(value_type __c) const _NOEXCEPT bool starts_with(value_type __c) const noexcept
{ return !empty() && _Traits::eq(front(), __c); } { return !empty() && _Traits::eq(front(), __c); }
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool starts_with(const value_type* __s) const _NOEXCEPT bool starts_with(const value_type* __s) const noexcept
{ return starts_with(__self_view(__s)); } { return starts_with(__self_view(__s)); }
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool ends_with(__self_view __sv) const _NOEXCEPT bool ends_with(__self_view __sv) const noexcept
{ return __self_view(data(), size()).ends_with( __sv); } { return __self_view(data(), size()).ends_with( __sv); }
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool ends_with(value_type __c) const _NOEXCEPT bool ends_with(value_type __c) const noexcept
{ return !empty() && _Traits::eq(back(), __c); } { return !empty() && _Traits::eq(back(), __c); }
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool ends_with(const value_type* __s) const _NOEXCEPT bool ends_with(const value_type* __s) const noexcept
{ return ends_with(__self_view(__s)); } { return ends_with(__self_view(__s)); }
#endif #endif
#if _LIBCPP_STD_VER > 20 #if _LIBCPP_STD_VER > 20
constexpr _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool contains(__self_view __sv) const noexcept bool contains(__self_view __sv) const noexcept
{ return __self_view(data(), size()).contains(__sv); } { return __self_view(data(), size()).contains(__sv); }
▲ Show 20 Lines • Show All 3,147 Lines • Show Last 20 Lines

libcxx/include/string_view

Show First 20 Lines • Show All 249 Lines • ▼ Show 20 Linespublic:
static_assert(( is_trivial<value_type>::value), "Character type of basic_string_view must be trivial"); static_assert(( is_trivial<value_type>::value), "Character type of basic_string_view must be trivial");
static_assert((is_same<_CharT, typename traits_type::char_type>::value), static_assert((is_same<_CharT, typename traits_type::char_type>::value),
"traits_type::char_type must be the same type as CharT"); "traits_type::char_type must be the same type as CharT");
// [string.view.cons], construct/copy // [string.view.cons], construct/copy
_LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
basic_string_view() _NOEXCEPT : __data (nullptr), __size(0) {} basic_string_view() _NOEXCEPT : __data (nullptr), __size(0) {}
_LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
basic_string_view(const basic_string_view&) _NOEXCEPT = default; basic_string_view(const basic_string_view&) _NOEXCEPT = default;
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
basic_string_view& operator=(const basic_string_view&) _NOEXCEPT = default; basic_string_view& operator=(const basic_string_view&) _NOEXCEPT = default;
_LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
basic_string_view(const _CharT* __s, size_type __len) _NOEXCEPT basic_string_view(const _CharT* __s, size_type __len) _NOEXCEPT
: __data(__s), __size(__len) : __data(__s), __size(__len)
{ {
#if _LIBCPP_STD_VER > 11 #if _LIBCPP_STD_VER > 11
_LIBCPP_ASSERT(__len == 0 || __s != nullptr, "string_view::string_view(_CharT *, size_t): received nullptr"); _LIBCPP_ASSERT(__len == 0 || __s != nullptr, "string_view::string_view(_CharT *, size_t): received nullptr");
▲ Show 20 Lines • Show All 343 Lines • ▼ Show 20 Lines#endif
size_type find_last_not_of(const _CharT* __s, size_type __pos=npos) const _NOEXCEPT size_type find_last_not_of(const _CharT* __s, size_type __pos=npos) const _NOEXCEPT
{ {
_LIBCPP_ASSERT(__s != nullptr, "string_view::find_last_not_of(): received nullptr"); _LIBCPP_ASSERT(__s != nullptr, "string_view::find_last_not_of(): received nullptr");
return __str_find_last_not_of<value_type, size_type, traits_type, npos> return __str_find_last_not_of<value_type, size_type, traits_type, npos>
(data(), size(), __s, __pos, traits_type::length(__s)); (data(), size(), __s, __pos, traits_type::length(__s));
} }
#if _LIBCPP_STD_VER > 17 #if _LIBCPP_STD_VER > 17
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool starts_with(basic_string_view __s) const _NOEXCEPT bool starts_with(basic_string_view __s) const noexcept
{ return size() >= __s.size() && compare(0, __s.size(), __s) == 0; } { return size() >= __s.size() && compare(0, __s.size(), __s) == 0; }
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool starts_with(value_type __c) const _NOEXCEPT bool starts_with(value_type __c) const noexcept
{ return !empty() && _Traits::eq(front(), __c); } { return !empty() && _Traits::eq(front(), __c); }
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool starts_with(const value_type* __s) const _NOEXCEPT bool starts_with(const value_type* __s) const noexcept
{ return starts_with(basic_string_view(__s)); } { return starts_with(basic_string_view(__s)); }
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool ends_with(basic_string_view __s) const _NOEXCEPT bool ends_with(basic_string_view __s) const noexcept
{ return size() >= __s.size() && compare(size() - __s.size(), npos, __s) == 0; } { return size() >= __s.size() && compare(size() - __s.size(), npos, __s) == 0; }
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool ends_with(value_type __c) const _NOEXCEPT bool ends_with(value_type __c) const noexcept
{ return !empty() && _Traits::eq(back(), __c); } { return !empty() && _Traits::eq(back(), __c); }
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool ends_with(const value_type* __s) const _NOEXCEPT bool ends_with(const value_type* __s) const noexcept
{ return ends_with(basic_string_view(__s)); } { return ends_with(basic_string_view(__s)); }
#endif #endif
#if _LIBCPP_STD_VER > 20 #if _LIBCPP_STD_VER > 20
constexpr _LIBCPP_INLINE_VISIBILITY constexpr _LIBCPP_INLINE_VISIBILITY
bool contains(basic_string_view __sv) const noexcept bool contains(basic_string_view __sv) const noexcept
{ return find(__sv) != npos; } { return find(__sv) != npos; }
▲ Show 20 Lines • Show All 245 Lines • Show Last 20 Lines