Skip to content

Cleanups 4: quoted() #2676

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

Merged
Stephan T. Lavavej (StephanTLavavej) merged 2 commits into from
May 1, 2022
Merged

Cleanups 4: quoted() #2676

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c28c594
<iomanip>: Avoid repeating types in quoted() by using `return {m,e,o,…
StephanTLavavej Apr 27, 2022
280d2c8
<iomanip>: Use char_traits::length() instead of a raw loop in quoted().
StephanTLavavej Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions stl/inc/iomanip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,34 +213,28 @@ struct _Quote_out { // store pointer/length for string
template <class _Elem>
_NODISCARD _Quote_out<_Elem, void, size_t> quoted(
const _Elem* _Ptr, _Elem _Delim = _Elem('"'), _Elem _Escape = _Elem('\\')) {
size_t _Size = 0;
while (_Ptr[_Size] != _Elem(0)) {
++_Size;
}

return _Quote_out<_Elem, void, size_t>(_Ptr, _Size, _Delim, _Escape);
const size_t _Size = char_traits<_Elem>::length(_Ptr);
Comment thread
StephanTLavavej marked this conversation as resolved.
return {_Ptr, _Size, _Delim, _Escape};
}

template <class _Elem, class _Traits, class _Alloc>
_NODISCARD _Quote_out<_Elem, _Traits, typename basic_string<_Elem, _Traits, _Alloc>::size_type> quoted(
const basic_string<_Elem, _Traits, _Alloc>& _Str, _Elem _Delim = _Elem('"'), _Elem _Escape = _Elem('\\')) {
using _Qobj = _Quote_out<_Elem, _Traits, typename basic_string<_Elem, _Traits, _Alloc>::size_type>;
return _Qobj(_Str.c_str(), _Str.size(), _Delim, _Escape);
return {_Str.c_str(), _Str.size(), _Delim, _Escape};
}

#if _HAS_CXX17
template <class _Elem, class _Traits>
_NODISCARD _Quote_out<_Elem, _Traits, size_t> quoted(
const basic_string_view<_Elem, _Traits> _Str, _Elem _Delim = _Elem('"'), _Elem _Escape = _Elem('\\')) {
using _Qobj = _Quote_out<_Elem, _Traits, size_t>;
return _Qobj(_Str.data(), _Str.size(), _Delim, _Escape);
return {_Str.data(), _Str.size(), _Delim, _Escape};
}
#endif // _HAS_CXX17

template <class _Elem, class _Traits, class _Alloc>
_NODISCARD _Quote_in<_Elem, _Traits, _Alloc> quoted(
basic_string<_Elem, _Traits, _Alloc>& _Str, _Elem _Delim = _Elem('"'), _Elem _Escape = _Elem('\\')) {
return _Quote_in<_Elem, _Traits, _Alloc>(_Str, _Delim, _Escape);
return {_Str, _Delim, _Escape};
}

template <class _Elem, class _Traits, class _QuTraits, class _Sizet>
Expand Down