[locale.time.get] - C++17 → C++20

Files changed (1) hide show

tmp/tmppv5admd7/{from.md → to.md} +7 -8

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

@@ -64,11 +64,11 @@ produce the sequence; otherwise either an error is reported or
 unspecified values are assigned.[^15]
 If the end iterator is reached during parsing by any of the `get()`
 member functions, the member sets `ios_base::eofbit` in `err`.
-##### `time_get` members <a id="locale.time.get.members">[[locale.time.get.members]]</a>
 ``` cpp
 dateorder date_order() const;
 ```
@@ -115,11 +115,11 @@ iter_type get(iter_type s, iter_type end, ios_base& f, ios_base::iostate& err,
 ``` cpp
 iter_type get(iter_type s, iter_type end, ios_base& f, ios_base::iostate& err,
               tm* t, const char_type* fmt, const char_type* fmtend) const;
 ```
-*Requires:* \[`fmt`, `fmtend`) shall be a valid range.
 *Effects:* The function starts by evaluating `err = ios_base::goodbit`.
 It then enters a loop, reading zero or more characters from `s` at each
 iteration. Unless otherwise specified below, the loop terminates when
 the first of the following conditions holds:
@@ -157,11 +157,11 @@ by what means the function performs case-insensitive comparison or
 whether multi-character sequences are considered while doing
 so. — *end note*]
 *Returns:* `s`.
-##### `time_get` virtual functions <a id="locale.time.get.virtuals">[[locale.time.get.virtuals]]</a>
 ``` cpp
 dateorder do_date_order() const;
 ```
@@ -191,14 +191,13 @@ iter_type do_get_date(iter_type s, iter_type end, ios_base& str,
 *Effects:* Reads characters starting at `s` until it has extracted those
 `struct tm` members and remaining format characters used by
 `time_put<>::put` to produce one of the following formats, or until it
 encounters an error. The format depends on the value returned by
-`date_order()` as shown in
-Table  [[tab:lib.locale.time.get.virtuals.dogetdate]].
-**Table: `do_get_date` effects** <a id="tab:lib.locale.time.get.virtuals.dogetdate">[tab:lib.locale.time.get.virtuals.dogetdate]</a>
 | `date_order()` | Format     |
 | -------------- | ---------- |
 | `no_order`     | `"%m%d%y"` |
 | `dmy`          | `"%d%m%y"` |
@@ -245,11 +244,11 @@ recognized as part of a valid year identifier.
 ``` cpp
 iter_type do_get(iter_type s, iter_type end, ios_base& f,
                  ios_base::iostate& err, tm* t, char format, char modifier) const;
 ```
-*Requires:* `t` shall point to an object.
 *Effects:* The function starts by evaluating `err = ios_base::goodbit`.
 It then reads characters starting at `s` until it encounters an error,
 or until it has extracted and assigned those `struct tm` members, and
 any remaining format characters, corresponding to a conversion directive
@@ -269,11 +268,11 @@ members from the input sequence \[`s`, `end`), it evaluates
 members are unspecified and may be outside their valid range.
 *Remarks:* It is unspecified whether multiple calls to `do_get()` with
 the address of the same `struct tm` object will update the current
 contents of the object or simply overwrite its members. Portable
-programs must zero out the object before invoking the function.
 *Returns:* An iterator pointing immediately beyond the last character
 recognized as possibly part of a valid input sequence for the given
 `format` and `modifier`.

 unspecified values are assigned.[^15]
 If the end iterator is reached during parsing by any of the `get()`
 member functions, the member sets `ios_base::eofbit` in `err`.
+##### Members <a id="locale.time.get.members">[[locale.time.get.members]]</a>
 ``` cpp
 dateorder date_order() const;
 ```
 ``` cpp
 iter_type get(iter_type s, iter_type end, ios_base& f, ios_base::iostate& err,
               tm* t, const char_type* fmt, const char_type* fmtend) const;
 ```
+*Preconditions:* \[`fmt`, `fmtend`) is a valid range.
 *Effects:* The function starts by evaluating `err = ios_base::goodbit`.
 It then enters a loop, reading zero or more characters from `s` at each
 iteration. Unless otherwise specified below, the loop terminates when
 the first of the following conditions holds:
 whether multi-character sequences are considered while doing
 so. — *end note*]
 *Returns:* `s`.
+##### Virtual functions <a id="locale.time.get.virtuals">[[locale.time.get.virtuals]]</a>
 ``` cpp
 dateorder do_date_order() const;
 ```
 *Effects:* Reads characters starting at `s` until it has extracted those
 `struct tm` members and remaining format characters used by
 `time_put<>::put` to produce one of the following formats, or until it
 encounters an error. The format depends on the value returned by
+`date_order()` as shown in [[locale.time.get.dogetdate]].
+**Table: `do_get_date` effects** <a id="locale.time.get.dogetdate">[locale.time.get.dogetdate]</a>
 | `date_order()` | Format     |
 | -------------- | ---------- |
 | `no_order`     | `"%m%d%y"` |
 | `dmy`          | `"%d%m%y"` |
 ``` cpp
 iter_type do_get(iter_type s, iter_type end, ios_base& f,
                  ios_base::iostate& err, tm* t, char format, char modifier) const;
 ```
+*Preconditions:* `t` points to an object.
 *Effects:* The function starts by evaluating `err = ios_base::goodbit`.
 It then reads characters starting at `s` until it encounters an error,
 or until it has extracted and assigned those `struct tm` members, and
 any remaining format characters, corresponding to a conversion directive
 members are unspecified and may be outside their valid range.
 *Remarks:* It is unspecified whether multiple calls to `do_get()` with
 the address of the same `struct tm` object will update the current
 contents of the object or simply overwrite its members. Portable
+programs should zero out the object before invoking the function.
 *Returns:* An iterator pointing immediately beyond the last character
 recognized as possibly part of a valid input sequence for the given
 `format` and `modifier`.

Diff to HTML by rtfpessoa