Merge branch 'master' of github.com:cplusplus/LWG

Author: Dani-Hub

xml/issue2220.xml

@@ -76,9 +76,7 @@ end-of-sequence iterators or both have the same underlying sequence.</ins>
 
 <note>2018-08-23 Casey revises the P/R in response to LWG feedback</note>
 
-</discussion>
-
-<resolution>
+<superseded>
 <p>This wording is relative to <a href="https://wg21.link/n4762">N4762</a>.</p>
 
 <ul>
@@ -108,6 +106,39 @@ same underlying sequence.</ins>
 </blockquote>
 </li>
 </ul>
+</superseded>
+
+<note>2024-10-03; Jonathan rebases the wording on the latest WP</note>
+
+</discussion>
+
+<resolution>
+<p>This wording is relative to <paper num="n4988"/>.</p>
+
+<ul>
+<li><p>Modify <sref ref="[re.tokiter.comp]"/> as follows:</p>
+<blockquote>
+<pre>
+bool operator==(const regex_token_iterator&amp; right) const;
+</pre>
+<p>
+<ins>-?- <i>Preconditions:</i>
+At least one of <tt>*this</tt> and <tt>right</tt> is an end-of-sequence iterator,
+or <tt>*this</tt> and <tt>right</tt> have the same underlying sequence.</ins>
+</p><p>
+-1- <i>Returns:</i> <tt>true</tt> if <tt>*this</tt> and <tt>right</tt> are both
+end-of-sequence 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`.
+</p>
+</blockquote>
+</li>
+</ul>
+
 </resolution>
 
 </issue>