[string.nonmembers] - C++20 → C++23

Files changed (1) hide show

tmp/tmprbov8w1f/{from.md → to.md} +20 -23

tmp/tmprbov8w1f/{from.md → to.md} RENAMED Viewed

@@ -53,11 +53,11 @@ return std::move(lhs);
 except that both `lhs` and `rhs` are left in valid but unspecified
 states.
 [*Note 1*: If `lhs` and `rhs` have equal allocators, the implementation
-may move from either. — *end note*]
 ``` cpp
 template<class charT, class traits, class Allocator>
   constexpr basic_string<charT, traits, Allocator>
     operator+(const basic_string<charT, traits, Allocator>& lhs,
@@ -140,11 +140,11 @@ template<class charT, class traits, class Allocator>
 ``` cpp
 lhs.push_back(rhs);
 return std::move(lhs);
 ```
-#### Non-member comparison functions <a id="string.cmp">[[string.cmp]]</a>
 ``` cpp
 template<class charT, class traits, class Allocator>
   constexpr bool
     operator==(const basic_string<charT, traits, Allocator>& lhs,
@@ -187,28 +187,27 @@ template<class charT, class traits, class Allocator>
     operator>>(basic_istream<charT, traits>& is, basic_string<charT, traits, Allocator>& str);
 ```
 *Effects:* Behaves as a formatted input
 function [[istream.formatted.reqmts]]. After constructing a `sentry`
-object, if the sentry converts to `true`, calls `str.erase()` and then
-extracts characters from `is` and appends them to `str` as if by calling
-`str.append(1, c)`. If `is.width()` is greater than zero, the maximum
-number `n` of characters appended is `is.width()`; otherwise `n` is
-`str.max_size()`. Characters are extracted and appended until any of the
-following occurs:
 - *n* characters are stored;
 - end-of-file occurs on the input sequence;
 - `isspace(c, is.getloc())` is `true` for the next available input
   character *c*.
 After the last character (if any) is extracted, `is.width(0)` is called
 and the `sentry` object is destroyed.
-If the function extracts no characters, it calls
-`is.setstate(ios_base::failbit)`, which may throw `ios_base::failure`
-[[iostate.flags]].
 *Returns:* `is`.
 ``` cpp
 template<class charT, class traits, class Allocator>
@@ -234,28 +233,26 @@ template<class charT, class traits, class Allocator>
 ```
 *Effects:* Behaves as an unformatted input
 function [[istream.unformatted]], except that it does not affect the
 value returned by subsequent calls to `basic_istream<>::gcount()`. After
-constructing a `sentry` object, if the sentry converts to `true`, calls
-`str.erase()` and then extracts characters from `is` and appends them to
-`str` as if by calling `str.append(1, c)` until any of the following
-occurs:
-- end-of-file occurs on the input sequence (in which case, the `getline`
-  function calls `is.setstate(ios_base::eofbit)`).
 - `traits::eq(c, delim)` for the next available input character *c* (in
-  which case, *c* is extracted but not appended) [[iostate.flags]]
-- `str.max_size()` characters are stored (in which case, the function
- calls `is.setstate(ios_base::failbit))` [[iostate.flags]]
 The conditions are tested in the order shown. In any case, after the
 last character is extracted, the `sentry` object is destroyed.
-If the function extracts no characters, it calls
-`is.setstate(ios_base::failbit)` which may throw `ios_base::failure`
-[[iostate.flags]].
 *Returns:* `is`.
 ``` cpp
 template<class charT, class traits, class Allocator>

 except that both `lhs` and `rhs` are left in valid but unspecified
 states.
 [*Note 1*: If `lhs` and `rhs` have equal allocators, the implementation
+can move from either. — *end note*]
 ``` cpp
 template<class charT, class traits, class Allocator>
   constexpr basic_string<charT, traits, Allocator>
     operator+(const basic_string<charT, traits, Allocator>& lhs,
 ``` cpp
 lhs.push_back(rhs);
 return std::move(lhs);
 ```
+#### Non-member comparison operator functions <a id="string.cmp">[[string.cmp]]</a>
 ``` cpp
 template<class charT, class traits, class Allocator>
   constexpr bool
     operator==(const basic_string<charT, traits, Allocator>& lhs,
     operator>>(basic_istream<charT, traits>& is, basic_string<charT, traits, Allocator>& str);
 ```
 *Effects:* Behaves as a formatted input
 function [[istream.formatted.reqmts]]. After constructing a `sentry`
+object, if the `sentry` object returns `true` when converted to a value
+of type `bool`, calls `str.erase()` and then extracts characters from
+`is` and appends them to `str` as if by calling `str.append(1, c)`. If
+`is.width()` is greater than zero, the maximum number `n` of characters
+appended is `is.width()`; otherwise `n` is `str.max_size()`. Characters
+are extracted and appended until any of the following occurs:
 - *n* characters are stored;
 - end-of-file occurs on the input sequence;
 - `isspace(c, is.getloc())` is `true` for the next available input
   character *c*.
 After the last character (if any) is extracted, `is.width(0)` is called
 and the `sentry` object is destroyed.
+If the function extracts no characters, `ios_base::failbit` is set in
+the input function’s local error state before `setstate` is called.
 *Returns:* `is`.
 ``` cpp
 template<class charT, class traits, class Allocator>
 ```
 *Effects:* Behaves as an unformatted input
 function [[istream.unformatted]], except that it does not affect the
 value returned by subsequent calls to `basic_istream<>::gcount()`. After
+constructing a `sentry` object, if the `sentry` object returns `true`
+when converted to a value of type `bool`, calls `str.erase()` and then
+extracts characters from `is` and appends them to `str` as if by calling
+`str.append(1, c)` until any of the following occurs:
+- end-of-file occurs on the input sequence;
 - `traits::eq(c, delim)` for the next available input character *c* (in
+  which case, *c* is extracted but not appended);
+- `str.max_size()` characters are stored (in which case,
+  `ios_base::failbit` is set in the input function’s local error state).
 The conditions are tested in the order shown. In any case, after the
 last character is extracted, the `sentry` object is destroyed.
+If the function extracts no characters, `ios_base::failbit` is set in
+the input function’s local error state before `setstate` is called.
 *Returns:* `is`.
 ``` cpp
 template<class charT, class traits, class Allocator>

Diff to HTML by rtfpessoa