[re.tokiter] - C++17 → C++20

Files changed (1) hide show

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

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

@@ -101,11 +101,10 @@ namespace std {
                            regex_constants::match_flag_type m =
                              regex_constants::match_default) = delete;
       regex_token_iterator(const regex_token_iterator&);
       regex_token_iterator& operator=(const regex_token_iterator&);
       bool operator==(const regex_token_iterator&) const;
-      bool operator!=(const regex_token_iterator&) const;
       const value_type& operator*() const;
       const value_type* operator->() const;
       regex_token_iterator& operator++();
       regex_token_iterator operator++(int);
@@ -128,16 +127,16 @@ suffix iterator the member `result` holds a pointer to the data member
 `suffix.first` points to the beginning of the final sequence, and
 `suffix.second` points to the end of the final sequence.
 [*Note 1*: For a suffix iterator, data member `suffix.first` is the
 same as the end of the last match found, and `suffix.second` is the same
-as the end of the target sequence — *end note*]
 The *current match* is `(*position).prefix()` if `subs[N] == -1`, or
 `(*position)[subs[N]]` for any other value of `subs[N]`.
-#### `regex_token_iterator` constructors <a id="re.tokiter.cnstr">[[re.tokiter.cnstr]]</a>
 ``` cpp
 regex_token_iterator();
 ```
@@ -164,30 +163,28 @@ template <size_t N>
                        const regex_type& re,
                        const int (&submatches)[N],
                        regex_constants::match_flag_type m = regex_constants::match_default);
 ```
-*Requires:* Each of the initialization values of `submatches` shall be
 `>= -1`.
 *Effects:* The first constructor initializes the member `subs` to hold
-the single value `submatch`. The second constructor initializes the
-member `subs` to hold a copy of the argument `submatches`. The third and
-fourth constructors initialize the member `subs` to hold a copy of the
-sequence of integer values pointed to by the iterator range
-\[`submatches.begin()`, `submatches.end()`) and \[`&submatches`,
-`&submatches + N`), respectively.
 Each constructor then sets `N` to 0, and `position` to
 `position_iterator(a, b, re, m)`. If `position` is not an
 end-of-sequence iterator the constructor sets `result` to the address of
 the current match. Otherwise if any of the values stored in `subs` is
 equal to -1 the constructor sets `*this` to a suffix iterator that
 points to the range \[`a`, `b`), otherwise the constructor sets `*this`
 to an end-of-sequence iterator.
-#### `regex_token_iterator` comparisons <a id="re.tokiter.comp">[[re.tokiter.comp]]</a>
 ``` cpp
 bool operator==(const regex_token_iterator& right) const;
 ```
@@ -196,17 +193,11 @@ iterators, or if `*this` and `right` are both suffix iterators and
 `suffix == right.suffix`; otherwise returns `false` if `*this` or
 `right` is an end-of-sequence iterator or a suffix iterator. Otherwise
 returns `true` if `position == right.position`, `N == right.N`, and
 `subs == right.subs`. Otherwise returns `false`.
-``` cpp
-bool operator!=(const regex_token_iterator& right) const;
-```
-*Returns:* `!(*this == right)`.
-#### `regex_token_iterator` indirection <a id="re.tokiter.deref">[[re.tokiter.deref]]</a>
 ``` cpp
 const value_type& operator*() const;
 ```
@@ -216,11 +207,11 @@ const value_type& operator*() const;
 const value_type* operator->() const;
 ```
 *Returns:* `result`.
-#### `regex_token_iterator` increment <a id="re.tokiter.incr">[[re.tokiter.incr]]</a>
 ``` cpp
 regex_token_iterator& operator++();
 ```

                            regex_constants::match_flag_type m =
                              regex_constants::match_default) = delete;
       regex_token_iterator(const regex_token_iterator&);
       regex_token_iterator& operator=(const regex_token_iterator&);
       bool operator==(const regex_token_iterator&) const;
       const value_type& operator*() const;
       const value_type* operator->() const;
       regex_token_iterator& operator++();
       regex_token_iterator operator++(int);
 `suffix.first` points to the beginning of the final sequence, and
 `suffix.second` points to the end of the final sequence.
 [*Note 1*: For a suffix iterator, data member `suffix.first` is the
 same as the end of the last match found, and `suffix.second` is the same
+as the end of the target sequence. — *end note*]
 The *current match* is `(*position).prefix()` if `subs[N] == -1`, or
 `(*position)[subs[N]]` for any other value of `subs[N]`.
+#### Constructors <a id="re.tokiter.cnstr">[[re.tokiter.cnstr]]</a>
 ``` cpp
 regex_token_iterator();
 ```
                        const regex_type& re,
                        const int (&submatches)[N],
                        regex_constants::match_flag_type m = regex_constants::match_default);
 ```
+*Preconditions:* Each of the initialization values of `submatches` is
 `>= -1`.
 *Effects:* The first constructor initializes the member `subs` to hold
+the single value `submatch`. The second, third, and fourth constructors
+initialize the member `subs` to hold a copy of the sequence of integer
+values pointed to by the iterator range \[`begin(submatches)`,
+`end(submatches)`).
 Each constructor then sets `N` to 0, and `position` to
 `position_iterator(a, b, re, m)`. If `position` is not an
 end-of-sequence iterator the constructor sets `result` to the address of
 the current match. Otherwise if any of the values stored in `subs` is
 equal to -1 the constructor sets `*this` to a suffix iterator that
 points to the range \[`a`, `b`), otherwise the constructor sets `*this`
 to an end-of-sequence iterator.
+#### Comparisons <a id="re.tokiter.comp">[[re.tokiter.comp]]</a>
 ``` cpp
 bool operator==(const regex_token_iterator& right) const;
 ```
 `suffix == right.suffix`; otherwise returns `false` if `*this` or
 `right` is an end-of-sequence iterator or a suffix iterator. Otherwise
 returns `true` if `position == right.position`, `N == right.N`, and
 `subs == right.subs`. Otherwise returns `false`.
+#### Indirection <a id="re.tokiter.deref">[[re.tokiter.deref]]</a>
 ``` cpp
 const value_type& operator*() const;
 ```
 const value_type* operator->() const;
 ```
 *Returns:* `result`.
+#### Increment <a id="re.tokiter.incr">[[re.tokiter.incr]]</a>
 ``` cpp
 regex_token_iterator& operator++();
 ```

Diff to HTML by rtfpessoa