[input.streams] - C++23 → Trunk

Files changed (1) hide show

tmp/tmpbbczzfy9/{from.md → to.md} +23 -13

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

@@ -20,13 +20,13 @@ namespace std {
   template<class charT, class traits = char_traits<charT>>
   class basic_istream : virtual public basic_ios<charT, traits> {
   public:
     // types (inherited from basic_ios[ios])
     using char_type   = charT;
-    using int_type    = typename traits::int_type;
-    using pos_type    = typename traits::pos_type;
-    using off_type    = typename traits::off_type;
     using traits_type = traits;
     // [istream.cons], constructor/destructor
     explicit basic_istream(basic_streambuf<charT, traits>* sb);
     virtual ~basic_istream();
@@ -67,10 +67,11 @@ namespace std {
     basic_istream& getline(char_type* s, streamsize n);
     basic_istream& getline(char_type* s, streamsize n, char_type delim);
     basic_istream& ignore(streamsize n = 1, int_type delim = traits::eof());
     int_type       peek();
     basic_istream& read    (char_type* s, streamsize n);
     streamsize     readsome(char_type* s, streamsize n);
     basic_istream& putback(char_type c);
@@ -148,11 +149,11 @@ virtual ~basic_istream();
 ``` cpp
 basic_istream& operator=(basic_istream&& rhs);
 ```
-*Effects:* Equivalent to: `swap(rhs)`.
 *Returns:* `*this`.
 ``` cpp
 void swap(basic_istream& rhs);
@@ -220,12 +221,12 @@ const ctype<charT>& ctype = use_facet<ctype<charT>>(is.getloc());
 if (ctype.is(ctype.space, c) != 0)
   // c is a whitespace character.
 ```
 If, after any preparation is completed, `is.good()` is `true`,
-`ok_ != false` otherwise, `ok_ == false`. During preparation, the
-constructor may call `setstate(failbit)` (which may throw
 `ios_base::failure` [[iostate.flags]]).[^19]
 ``` cpp
 ~sentry();
 ```
@@ -234,11 +235,11 @@ constructor may call `setstate(failbit)` (which may throw
 ``` cpp
 explicit operator bool() const;
 ```
-*Returns:* `ok_`.
 #### Formatted input functions <a id="istream.formatted">[[istream.formatted]]</a>
 ##### Common requirements <a id="istream.formatted.reqmts">[[istream.formatted.reqmts]]</a>
@@ -672,11 +673,11 @@ int main() {
 ``` cpp
 basic_istream& getline(char_type* s, streamsize n);
 ```
-*Returns:* `getline(s, n, widen(’\n’))`
 ``` cpp
 basic_istream& ignore(streamsize n = 1, int_type delim = traits::eof());
 ```
@@ -684,11 +685,11 @@ basic_istream& ignore(streamsize n = 1, int_type delim = traits::eof());
 above). After constructing a `sentry` object, extracts characters and
 discards them. Characters are extracted until any of the following
 occurs:
 - `n != numeric_limits<streamsize>::max()` [[numeric.limits]] and `n`
-  characters have been extracted so far
 - end-of-file occurs on the input sequence (in which case the function
   calls `setstate(eofbit)`, which may throw `ios_base::failure`
   [[iostate.flags]]);
 - `traits::eq_int_type(traits::to_int_type(c), delim)` for the next
   available input character `c` (in which case `c` is extracted).
@@ -696,10 +697,19 @@ occurs:
 [*Note 1*: The last condition will never occur if
 `traits::eq_int_type(delim, traits::eof())`. — *end note*]
 *Returns:* `*this`.
 ``` cpp
 int_type peek();
 ```
 *Effects:* Behaves as an unformatted input function (as described
@@ -887,13 +897,13 @@ namespace std {
   class basic_iostream
     : public basic_istream<charT, traits>,
       public basic_ostream<charT, traits> {
   public:
     using char_type   = charT;
-    using int_type    = typename traits::int_type;
-    using pos_type    = typename traits::pos_type;
-    using off_type    = typename traits::off_type;
     using traits_type = traits;
     // [iostream.cons], constructor
     explicit basic_iostream(basic_streambuf<charT, traits>* sb);
@@ -948,11 +958,11 @@ virtual ~basic_iostream();
 ``` cpp
 basic_iostream& operator=(basic_iostream&& rhs);
 ```
-*Effects:* Equivalent to: `swap(rhs)`.
 ``` cpp
 void swap(basic_iostream& rhs);
 ```

   template<class charT, class traits = char_traits<charT>>
   class basic_istream : virtual public basic_ios<charT, traits> {
   public:
     // types (inherited from basic_ios[ios])
     using char_type   = charT;
+    using int_type    = traits::int_type;
+    using pos_type    = traits::pos_type;
+    using off_type    = traits::off_type;
     using traits_type = traits;
     // [istream.cons], constructor/destructor
     explicit basic_istream(basic_streambuf<charT, traits>* sb);
     virtual ~basic_istream();
     basic_istream& getline(char_type* s, streamsize n);
     basic_istream& getline(char_type* s, streamsize n, char_type delim);
     basic_istream& ignore(streamsize n = 1, int_type delim = traits::eof());
+    basic_istream& ignore(streamsize n, char_type delim);
     int_type       peek();
     basic_istream& read    (char_type* s, streamsize n);
     streamsize     readsome(char_type* s, streamsize n);
     basic_istream& putback(char_type c);
 ``` cpp
 basic_istream& operator=(basic_istream&& rhs);
 ```
+*Effects:* Equivalent to `swap(rhs)`.
 *Returns:* `*this`.
 ``` cpp
 void swap(basic_istream& rhs);
 if (ctype.is(ctype.space, c) != 0)
   // c is a whitespace character.
 ```
 If, after any preparation is completed, `is.good()` is `true`,
+*`ok_`*` != false` otherwise, *`ok_`*` == false`. During preparation,
+the constructor may call `setstate(failbit)` (which may throw
 `ios_base::failure` [[iostate.flags]]).[^19]
 ``` cpp
 ~sentry();
 ```
 ``` cpp
 explicit operator bool() const;
 ```
+*Returns:* *ok\_*.
 #### Formatted input functions <a id="istream.formatted">[[istream.formatted]]</a>
 ##### Common requirements <a id="istream.formatted.reqmts">[[istream.formatted.reqmts]]</a>
 ``` cpp
 basic_istream& getline(char_type* s, streamsize n);
 ```
+*Returns:* `getline(s, n, widen(’\n’))`.
 ``` cpp
 basic_istream& ignore(streamsize n = 1, int_type delim = traits::eof());
 ```
 above). After constructing a `sentry` object, extracts characters and
 discards them. Characters are extracted until any of the following
 occurs:
 - `n != numeric_limits<streamsize>::max()` [[numeric.limits]] and `n`
+  characters have been extracted so far;
 - end-of-file occurs on the input sequence (in which case the function
   calls `setstate(eofbit)`, which may throw `ios_base::failure`
   [[iostate.flags]]);
 - `traits::eq_int_type(traits::to_int_type(c), delim)` for the next
   available input character `c` (in which case `c` is extracted).
 [*Note 1*: The last condition will never occur if
 `traits::eq_int_type(delim, traits::eof())`. — *end note*]
 *Returns:* `*this`.
+``` cpp
+basic_istream& ignore(streamsize n, char_type delim);
+```
+*Constraints:* `is_same_v<char_type, char>` is `true`.
+*Effects:* Equivalent to:
+`return ignore(n, traits::to_int_type(delim));`
 ``` cpp
 int_type peek();
 ```
 *Effects:* Behaves as an unformatted input function (as described
   class basic_iostream
     : public basic_istream<charT, traits>,
       public basic_ostream<charT, traits> {
   public:
     using char_type   = charT;
+    using int_type    = traits::int_type;
+    using pos_type    = traits::pos_type;
+    using off_type    = traits::off_type;
     using traits_type = traits;
     // [iostream.cons], constructor
     explicit basic_iostream(basic_streambuf<charT, traits>* sb);
 ``` cpp
 basic_iostream& operator=(basic_iostream&& rhs);
 ```
+*Effects:* Equivalent to `swap(rhs)`.
 ``` cpp
 void swap(basic_iostream& rhs);
 ```

Diff to HTML by rtfpessoa