[category.time] - C++17 → C++20

Files changed (1) hide show

tmp/tmpadb0eodg/{from.md → to.md} +15 -16

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

@@ -2,14 +2,13 @@
 Templates `time_get<charT, InputIterator>` and
 `time_put<charT, OutputIterator>` provide date and time formatting and
 parsing. All specifications of member functions for `time_put` and
 `time_get` in the subclauses of  [[category.time]] only apply to the
-specializations required in Tables  [[tab:localization.category.facets]]
-and  [[tab:localization.required.specializations]] (
-[[locale.category]]). Their members use their `ios_base&`,
-`ios_base::iostate&`, and `fill` arguments as described in
 [[locale.categories]], and the `ctype<>` facet, to determine formatting
 details.
 #### Class template `time_get` <a id="locale.time.get">[[locale.time.get]]</a>
@@ -77,11 +76,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;
 ```
@@ -128,11 +127,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:
@@ -170,11 +169,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;
 ```
@@ -204,14 +203,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"` |
@@ -258,11 +256,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
@@ -282,11 +280,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`.
@@ -300,10 +298,11 @@ namespace std {
       using dateorder = time_base::dateorder;
       using iter_type = InputIterator;
       explicit time_get_byname(const char*, size_t refs = 0);
       explicit time_get_byname(const string&, size_t refs = 0);
     protected:
       ~time_get_byname();
     };
 }
 ```
@@ -334,11 +333,11 @@ namespace std {
                                char format, char modifier) const;
     };
 }
 ```
-##### `time_put` members <a id="locale.time.put.members">[[locale.time.put.members]]</a>
 ``` cpp
 iter_type put(iter_type s, ios_base& str, char_type fill, const tm* t,
               const charT* pattern, const charT* pat_end) const;
 iter_type put(iter_type s, ios_base& str, char_type fill, const tm* t,
@@ -367,11 +366,11 @@ implementation-defined formats or by derivations. A space character is a
 reasonable default for this argument. — *end note*]
 *Returns:* An iterator pointing immediately after the last character
 produced.
-##### `time_put` virtual functions <a id="locale.time.put.virtuals">[[locale.time.put.virtuals]]</a>
 ``` cpp
 iter_type do_put(iter_type s, ios_base&, char_type fill, const tm* t,
                  char format, char modifier) const;
 ```
@@ -394,18 +393,18 @@ reasonable default for this argument. — *end note*]
 #### Class template `time_put_byname` <a id="locale.time.put.byname">[[locale.time.put.byname]]</a>
 ``` cpp
 namespace std {
   template<class charT, class OutputIterator = ostreambuf_iterator<charT>>
- class time_put_byname : public time_put<charT, OutputIterator>
-  {
     public:
       using char_type = charT;
       using iter_type = OutputIterator;
       explicit time_put_byname(const char*, size_t refs = 0);
       explicit time_put_byname(const string&, size_t refs = 0);
     protected:
       ~time_put_byname();
     };
 }
 ```

 Templates `time_get<charT, InputIterator>` and
 `time_put<charT, OutputIterator>` provide date and time formatting and
 parsing. All specifications of member functions for `time_put` and
 `time_get` in the subclauses of  [[category.time]] only apply to the
+specializations required in Tables  [[tab:locale.category.facets]] and
+[[tab:locale.spec]] [[locale.category]]. Their members use their
+`ios_base&`, `ios_base::iostate&`, and `fill` arguments as described in
 [[locale.categories]], and the `ctype<>` facet, to determine formatting
 details.
 #### Class template `time_get` <a id="locale.time.get">[[locale.time.get]]</a>
 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`.
       using dateorder = time_base::dateorder;
       using iter_type = InputIterator;
       explicit time_get_byname(const char*, size_t refs = 0);
       explicit time_get_byname(const string&, size_t refs = 0);
     protected:
       ~time_get_byname();
     };
 }
 ```
                                char format, char modifier) const;
     };
 }
 ```
+##### Members <a id="locale.time.put.members">[[locale.time.put.members]]</a>
 ``` cpp
 iter_type put(iter_type s, ios_base& str, char_type fill, const tm* t,
               const charT* pattern, const charT* pat_end) const;
 iter_type put(iter_type s, ios_base& str, char_type fill, const tm* t,
 reasonable default for this argument. — *end note*]
 *Returns:* An iterator pointing immediately after the last character
 produced.
+##### Virtual functions <a id="locale.time.put.virtuals">[[locale.time.put.virtuals]]</a>
 ``` cpp
 iter_type do_put(iter_type s, ios_base&, char_type fill, const tm* t,
                  char format, char modifier) const;
 ```
 #### Class template `time_put_byname` <a id="locale.time.put.byname">[[locale.time.put.byname]]</a>
 ``` cpp
 namespace std {
   template<class charT, class OutputIterator = ostreambuf_iterator<charT>>
+ class time_put_byname : public time_put<charT, OutputIterator> {
     public:
       using char_type = charT;
       using iter_type = OutputIterator;
       explicit time_put_byname(const char*, size_t refs = 0);
       explicit time_put_byname(const string&, size_t refs = 0);
     protected:
       ~time_put_byname();
     };
 }
 ```

Diff to HTML by rtfpessoa