[input.streams] - C++11 → C++14

Files changed (1) hide show

tmp/tmp8olkz3a9/{from.md → to.md} +19 -19

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

@@ -185,11 +185,11 @@ values returned by `gcount()` and `rhs.gcount()`.
 ``` cpp
 namespace std {
   template <class charT,class traits = char_traits<charT> >
   class basic_istream<charT,traits>::sentry {
     typedef traits traits_type;
-    bool ok_; // exposition onlyr
   public:
     explicit sentry(basic_istream<charT,traits>& is, bool noskipws = false);
     ~sentry();
     explicit operator bool() const { return ok_; }
     sentry(const sentry&) = delete;
@@ -203,19 +203,19 @@ exception safe prefix and suffix operations.
 ``` cpp
 explicit sentry(basic_istream<charT,traits>& is, bool noskipws = false);
 ```
-*Effects:* If `is.good()` is `false`, calls is.setstate(failbit).
 Otherwise, prepares for formatted or unformatted input. First, if
 `is.tie()` is not a null pointer, the function calls `is.tie()->flush()`
 to synchronize the output sequence with any associated external C
 stream. Except that this call can be suppressed if the put area of
 `is.tie()` is empty. Further an implementation is allowed to defer the
 call to `flush` until a call of `is.rdbuf()->underflow()` occurs. If no
 such call occurs before the `sentry` object is destroyed, the call to
-`flush` may be eliminated entirely.[^16] If `noskipws` is zero and
 `is.flags() & ios_base::skipws` is nonzero, the function extracts and
 discards each character as long as the next available input character
 `c` is a whitespace character. If `is.rdbuf()->sbumpc()` or
 `is.rdbuf()->sgetc()` returns `traits::eof()`, the function calls
 `setstate(failbit | eofbit)` (which may throw `ios_base::failure`).
@@ -235,11 +235,11 @@ if (ctype.is(ctype.space,c)!=0)
 ```
 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]]))[^17]
 ``` cpp
 ~sentry();
 ```
@@ -257,11 +257,11 @@ explicit operator bool() const;
 Each formatted input function begins execution by constructing an object
 of class `sentry` with the `noskipws` (second) argument `false`. If the
 `sentry` object returns `true`, when converted to a value of type
 `bool`, the function endeavors to obtain the requested input. If an
-exception is thrown during input then `ios::badbit` is turned on[^18] in
 `*this`’s error state. If `(exceptions()&badbit) != 0` then the
 exception is rethrown. In any case, the formatted input function
 destroys the `sentry` object. If no exception has been thrown, it
 returns `*this`.
@@ -350,17 +350,17 @@ setstate(err);
 ##### `basic_istream::operator>>` <a id="istream::extractors">[[istream::extractors]]</a>
 ``` cpp
 basic_istream<charT,traits>& operator>>
-    (basic_istream<charT,traits>& (*pf)(basic_istream<charT,traits>&))
 ```
 *Effects:* None. This extractor does not behave as a formatted input
 function (as described in  [[istream.formatted.reqmts]].)
-*Returns:* `pf(*this)`.[^19]
 ``` cpp
 basic_istream<charT,traits>& operator>>
     (basic_ios<charT,traits>& (*pf)(basic_ios<charT,traits>&));
 ```
@@ -374,11 +374,11 @@ in  [[istream.formatted.reqmts]]).
 ``` cpp
 basic_istream<charT,traits>& operator>>
     (ios_base& (*pf)(ios_base&));
 ```
-*Effects:* Calls `pf(*this)`.[^20] This extractor does not behave as a
 formatted input function (as described
 in  [[istream.formatted.reqmts]]).
 *Returns:* `*this`.
@@ -476,11 +476,11 @@ an exception or if the sentry object returns false, when converted to a
 value of type `bool`, the function returns without attempting to obtain
 any input. In either case the number of extracted characters is set to
 0; unformatted input functions taking a character array of non-zero size
 as an argument shall also store a null character (using `charT()`) in
 the first location of the array. If an exception is thrown during input
-then `ios::badbit` is turned on[^21] in `*this`’s error state.
 (Exceptions thrown from `basic_ios<>::clear()` are not caught or
 rethrown.) If `(exceptions()&badbit) != 0` then the exception is
 rethrown. It also counts the number of characters extracted. If no
 exception has been thrown it ends by storing the count in a member
 object and returning the value specified. In any event the `sentry`
@@ -513,11 +513,11 @@ basic_istream<charT,traits>& get(char_type& c);
 ```
 *Effects:* Behaves as an unformatted input function (as described
 in  [[istream.unformatted]], paragraph 1). After constructing a sentry
 object, extracts a character, if one is available, and assigns it to
-`c`.[^22] Otherwise, the function calls `setstate(failbit)` (which may
 throw `ios_base::failure` ([[iostate.flags]])).
 *Returns:* `*this`.
 ``` cpp
@@ -526,11 +526,11 @@ basic_istream<charT,traits>& get(char_type* s, streamsize n,
 ```
 *Effects:* Behaves as an unformatted input function (as described
 in  [[istream.unformatted]], paragraph 1). After constructing a sentry
 object, extracts characters and stores them into successive locations of
-an array whose first element is designated by `s`.[^23] Characters are
 extracted and stored until any of the following occurs:
 - `n` is less than one or `n - 1` characters are stored;
 - end-of-file occurs on the input sequence (in which case the function
   calls `setstate(eofbit)`);
@@ -543,11 +543,11 @@ if `n` is greater than zero it then stores a null character into the
 next successive location of the array.
 *Returns:* `*this`.
 ``` cpp
-basic_istream<charT,traits>& get(char_type* s, streamsize n)
 ```
 *Effects:* Calls `get(s,n,widen(’\n’))`
 *Returns:* Value returned by the call.
@@ -590,25 +590,25 @@ basic_istream<charT,traits>& getline(char_type* s, streamsize n,
 ```
 *Effects:* Behaves as an unformatted input function (as described
 in  [[istream.unformatted]], paragraph 1). After constructing a sentry
 object, extracts characters and stores them into successive locations of
-an array whose first element is designated by `s`.[^24] Characters are
 extracted and stored until one of the following occurs:
 1.  end-of-file occurs on the input sequence (in which case the function
     calls `setstate(eofbit)`);
 2.  `traits::eq(c, delim)` for the next available input character `c`
     (in which case the input character is extracted but not
-    stored);[^25]
 3.  `n` is less than one or `n - 1` characters are stored (in which case
     the function calls `setstate(failbit)`).
-These conditions are tested in the order shown.[^26]
 If the function extracts no characters, it calls `setstate(failbit)`
-(which may throw `ios_base::failure` ([[iostate.flags]])).[^27]
 In any case, if `n` is greater than zero, it then stores a null
 character (using `charT()`) into the next successive location of the
 array.
@@ -653,12 +653,12 @@ basic_istream<charT,traits>&
 *Effects:* Behaves as an unformatted input function (as described
 in  [[istream.unformatted]], paragraph 1). After constructing a sentry
 object, extracts characters and discards them. Characters are extracted
 until any of the following occurs:
-- if `n != numeric_limits<streamsize>::max()` ([[limits]]), `n`
-  characters are extracted
 - 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).
@@ -686,11 +686,11 @@ basic_istream<charT,traits>& read(char_type* s, streamsize n);
 *Effects:* Behaves as an unformatted input function (as described
 in  [[istream.unformatted]], paragraph 1). After constructing a sentry
 object, if `!good()` calls `setstate(failbit)` which may throw an
 exception, and return. Otherwise extracts characters and stores them
 into successive locations of an array whose first element is designated
-by `s`.[^28] Characters are extracted and stored until either of the
 following occurs:
 - `n` characters are stored;
 - end-of-file occurs on the input sequence (in which case the function
   calls `setstate(failbit | eofbit)`, which may throw

 ``` cpp
 namespace std {
   template <class charT,class traits = char_traits<charT> >
   class basic_istream<charT,traits>::sentry {
     typedef traits traits_type;
+    bool ok_; // exposition only
   public:
     explicit sentry(basic_istream<charT,traits>& is, bool noskipws = false);
     ~sentry();
     explicit operator bool() const { return ok_; }
     sentry(const sentry&) = delete;
 ``` cpp
 explicit sentry(basic_istream<charT,traits>& is, bool noskipws = false);
 ```
+*Effects:* If `is.good()` is `false`, calls `is.setstate(failbit)`.
 Otherwise, prepares for formatted or unformatted input. First, if
 `is.tie()` is not a null pointer, the function calls `is.tie()->flush()`
 to synchronize the output sequence with any associated external C
 stream. Except that this call can be suppressed if the put area of
 `is.tie()` is empty. Further an implementation is allowed to defer the
 call to `flush` until a call of `is.rdbuf()->underflow()` occurs. If no
 such call occurs before the `sentry` object is destroyed, the call to
+`flush` may be eliminated entirely.[^17] If `noskipws` is zero and
 `is.flags() & ios_base::skipws` is nonzero, the function extracts and
 discards each character as long as the next available input character
 `c` is a whitespace character. If `is.rdbuf()->sbumpc()` or
 `is.rdbuf()->sgetc()` returns `traits::eof()`, the function calls
 `setstate(failbit | eofbit)` (which may throw `ios_base::failure`).
 ```
 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]]))[^18]
 ``` cpp
 ~sentry();
 ```
 Each formatted input function begins execution by constructing an object
 of class `sentry` with the `noskipws` (second) argument `false`. If the
 `sentry` object returns `true`, when converted to a value of type
 `bool`, the function endeavors to obtain the requested input. If an
+exception is thrown during input then `ios::badbit` is turned on[^19] in
 `*this`’s error state. If `(exceptions()&badbit) != 0` then the
 exception is rethrown. In any case, the formatted input function
 destroys the `sentry` object. If no exception has been thrown, it
 returns `*this`.
 ##### `basic_istream::operator>>` <a id="istream::extractors">[[istream::extractors]]</a>
 ``` cpp
 basic_istream<charT,traits>& operator>>
+    (basic_istream<charT,traits>& (*pf)(basic_istream<charT,traits>&));
 ```
 *Effects:* None. This extractor does not behave as a formatted input
 function (as described in  [[istream.formatted.reqmts]].)
+*Returns:* `pf(*this)`.[^20]
 ``` cpp
 basic_istream<charT,traits>& operator>>
     (basic_ios<charT,traits>& (*pf)(basic_ios<charT,traits>&));
 ```
 ``` cpp
 basic_istream<charT,traits>& operator>>
     (ios_base& (*pf)(ios_base&));
 ```
+*Effects:* Calls `pf(*this)`.[^21] This extractor does not behave as a
 formatted input function (as described
 in  [[istream.formatted.reqmts]]).
 *Returns:* `*this`.
 value of type `bool`, the function returns without attempting to obtain
 any input. In either case the number of extracted characters is set to
 0; unformatted input functions taking a character array of non-zero size
 as an argument shall also store a null character (using `charT()`) in
 the first location of the array. If an exception is thrown during input
+then `ios::badbit` is turned on[^22] in `*this`’s error state.
 (Exceptions thrown from `basic_ios<>::clear()` are not caught or
 rethrown.) If `(exceptions()&badbit) != 0` then the exception is
 rethrown. It also counts the number of characters extracted. If no
 exception has been thrown it ends by storing the count in a member
 object and returning the value specified. In any event the `sentry`
 ```
 *Effects:* Behaves as an unformatted input function (as described
 in  [[istream.unformatted]], paragraph 1). After constructing a sentry
 object, extracts a character, if one is available, and assigns it to
+`c`.[^23] Otherwise, the function calls `setstate(failbit)` (which may
 throw `ios_base::failure` ([[iostate.flags]])).
 *Returns:* `*this`.
 ``` cpp
 ```
 *Effects:* Behaves as an unformatted input function (as described
 in  [[istream.unformatted]], paragraph 1). After constructing a sentry
 object, extracts characters and stores them into successive locations of
+an array whose first element is designated by `s`.[^24] Characters are
 extracted and stored until any of the following occurs:
 - `n` is less than one or `n - 1` characters are stored;
 - end-of-file occurs on the input sequence (in which case the function
   calls `setstate(eofbit)`);
 next successive location of the array.
 *Returns:* `*this`.
 ``` cpp
+basic_istream<charT,traits>& get(char_type* s, streamsize n);
 ```
 *Effects:* Calls `get(s,n,widen(’\n’))`
 *Returns:* Value returned by the call.
 ```
 *Effects:* Behaves as an unformatted input function (as described
 in  [[istream.unformatted]], paragraph 1). After constructing a sentry
 object, extracts characters and stores them into successive locations of
+an array whose first element is designated by `s`.[^25] Characters are
 extracted and stored until one of the following occurs:
 1.  end-of-file occurs on the input sequence (in which case the function
     calls `setstate(eofbit)`);
 2.  `traits::eq(c, delim)` for the next available input character `c`
     (in which case the input character is extracted but not
+    stored);[^26]
 3.  `n` is less than one or `n - 1` characters are stored (in which case
     the function calls `setstate(failbit)`).
+These conditions are tested in the order shown.[^27]
 If the function extracts no characters, it calls `setstate(failbit)`
+(which may throw `ios_base::failure` ([[iostate.flags]])).[^28]
 In any case, if `n` is greater than zero, it then stores a null
 character (using `charT()`) into the next successive location of the
 array.
 *Effects:* Behaves as an unformatted input function (as described
 in  [[istream.unformatted]], paragraph 1). After constructing a sentry
 object, extracts characters and discards them. Characters are extracted
 until any of the following occurs:
+- `n != numeric_limits<streamsize>::max()` ([[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).
 *Effects:* Behaves as an unformatted input function (as described
 in  [[istream.unformatted]], paragraph 1). After constructing a sentry
 object, if `!good()` calls `setstate(failbit)` which may throw an
 exception, and return. Otherwise extracts characters and stores them
 into successive locations of an array whose first element is designated
+by `s`.[^29] Characters are extracted and stored until either of the
 following occurs:
 - `n` characters are stored;
 - end-of-file occurs on the input sequence (in which case the function
   calls `setstate(failbit | eofbit)`, which may throw

Diff to HTML by rtfpessoa