[iterators.counted] Exposition-only style for current and length

Author: frederick-vs-ja

source/iterators.tex

@@ -5989,15 +5989,15 @@
         const counted_iterator& x, const counted_iterator<I2>& y);
 
     friend constexpr decltype(auto) iter_move(const counted_iterator& i)
-      noexcept(noexcept(ranges::iter_move(i.current)))
+      noexcept(noexcept(ranges::iter_move(i.@\exposid{current}@)))
         requires @\libconcept{input_iterator}@<I>;
     template<@\libconcept{indirectly_swappable}@<I> I2>
       friend constexpr void iter_swap(const counted_iterator& x, const counted_iterator<I2>& y)
-        noexcept(noexcept(ranges::iter_swap(x.current, y.current)));
+        noexcept(noexcept(ranges::iter_swap(x.@\exposid{current}@, y.@\exposid{current}@)));
 
   private:
-    I current = I();                    // \expos
-    iter_difference_t<I> length = 0;    // \expos
+    I @\exposid{current}@ = I();                    // \expos
+    iter_difference_t<I> @\exposid{length}@ = 0;    // \expos
   };
 
   template<@\libconcept{input_iterator}@ I>
@@ -6023,8 +6023,8 @@
 
 \pnum
 \effects
-Initializes \tcode{current} with \tcode{std::move(i)} and
-\tcode{length} with \tcode{n}.
+Initializes \exposid{current} with \tcode{std::move(i)} and
+\exposid{length} with \tcode{n}.
 \end{itemdescr}
 
 \indexlibraryctor{counted_iterator}%
@@ -6037,8 +6037,8 @@
 \begin{itemdescr}
 \pnum
 \effects
-Initializes \tcode{current} with \tcode{x.current} and
-\tcode{length} with \tcode{x.length}.
+Initializes \exposid{current} with \tcode{x.\exposid{current}} and
+\exposid{length} with \tcode{x.\exposid{length}}.
 \end{itemdescr}
 
 \indexlibrarymember{operator=}{counted_iterator}%
@@ -6051,8 +6051,8 @@
 \begin{itemdescr}
 \pnum
 \effects
-Assigns \tcode{x.current} to \tcode{current} and
-\tcode{x.length} to \tcode{length}.
+Assigns \tcode{x.\exposid{current}} to \exposid{current} and
+\tcode{x.\exposid{length}} to \exposid{length}.
 
 \pnum
 \returns
@@ -6069,7 +6069,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to: \tcode{return current;}
+Equivalent to: \tcode{return \exposid{current};}
 \end{itemdescr}
 
 \indexlibrarymember{base}{counted_iterator}%
@@ -6080,7 +6080,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{std::move(current)}.
+\tcode{std::move(\exposid{current})}.
 \end{itemdescr}
 
 \indexlibrarymember{count}{counted_iterator}%
@@ -6091,7 +6091,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to: \tcode{return length;}
+Equivalent to: \tcode{return \exposid{length};}
 \end{itemdescr}
 
 \rSec3[counted.iter.elem]{Element access}
@@ -6106,11 +6106,11 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{length > 0} is \tcode{true}.
+\tcode{\exposid{length} > 0} is \tcode{true}.
 
 \pnum
 \effects
-Equivalent to: \tcode{return *current;}
+Equivalent to: \tcode{return *\exposid{current};}
 \end{itemdescr}
 
 \indexlibrarymember{operator->}{counted_iterator}%
@@ -6122,7 +6122,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to: \tcode{return to_address(current);}
+Equivalent to: \tcode{return to_address(\exposid{current});}
 \end{itemdescr}
 
 \indexlibrarymember{operator[]}{counted_iterator}%
@@ -6138,7 +6138,7 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return current[n];}
+Equivalent to: \tcode{return \exposid{current}[n];}
 \end{itemdescr}
 
 \rSec3[counted.iter.nav]{Navigation}
@@ -6151,14 +6151,14 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{length > 0} is \tcode{true}.
+\tcode{\exposid{length} > 0} is \tcode{true}.
 
 \pnum
 \effects
 Equivalent to:
 \begin{codeblock}
-++current;
---length;
+++@\exposid{current}@;
+--@\exposid{length}@;
 return *this;
 \end{codeblock}
 \end{itemdescr}
@@ -6171,15 +6171,15 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{length > 0} is \tcode{true}.
+\tcode{\exposid{length} > 0} is \tcode{true}.
 
 \pnum
 \effects
 Equivalent to:
 \begin{codeblock}
---length;
-try { return current++; }
-catch(...) { ++length; throw; }
+--@\exposid{length}@;
+try { return @\exposid{current}@++; }
+catch(...) { ++@\exposid{length}@; throw; }
 \end{codeblock}
 \end{itemdescr}
 
@@ -6211,8 +6211,8 @@
 \effects
 Equivalent to:
 \begin{codeblock}
---current;
-++length;
+--@\exposid{current}@;
+++@\exposid{length}@;
 return *this;
 \end{codeblock}
 \end{itemdescr}
@@ -6243,7 +6243,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to: \tcode{return counted_iterator(current + n, length - n);}
+Equivalent to: \tcode{return counted_iterator(\exposid{current} + n, \exposid{length} - n);}
 \end{itemdescr}
 
 \indexlibrarymember{operator+}{counted_iterator}%
@@ -6268,14 +6268,14 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{n <= length} is \tcode{true}.
+\tcode{n <= \exposid{length} is \tcode{true}}.
 
 \pnum
 \effects
 Equivalent to:
 \begin{codeblock}
-current += n;
-length -= n;
+@\exposid{current}@ += n;
+@\exposid{length}@ -= n;
 return *this;
 \end{codeblock}
 \end{itemdescr}
@@ -6289,7 +6289,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to: \tcode{return counted_iterator(current - n, length + n);}
+Equivalent to: \tcode{return counted_iterator(\exposid{current} - n, \exposid{length} + n);}
 \end{itemdescr}
 
 \indexlibrarymember{operator-}{counted_iterator}%
@@ -6307,7 +6307,7 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return y.length - x.length;}
+Equivalent to: \tcode{return y.\exposid{length} - x.\exposid{length};}
 \end{itemdescr}
 
 \indexlibrarymember{operator-}{counted_iterator}%
@@ -6320,7 +6320,7 @@
 \pnum
 \effects
 Equivalent to:
-\tcode{return -x.length;}
+\tcode{return -x.\exposid{length};}
 \end{itemdescr}
 
 \indexlibrarymember{operator-}{counted_iterator}%
@@ -6332,7 +6332,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to: \tcode{return y.length;}
+Equivalent to: \tcode{return y.\exposid{length};}
 \end{itemdescr}
 
 \indexlibrarymember{operator-=}{counted_iterator}%
@@ -6344,14 +6344,14 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{-n <= length} is \tcode{true}.
+\tcode{-n <= \exposid{length} is \tcode{true}}.
 
 \pnum
 \effects
 Equivalent to:
 \begin{codeblock}
-current -= n;
-length += n;
+@\exposid{current}@ -= n;
+@\exposid{length}@ += n;
 return *this;
 \end{codeblock}
 \end{itemdescr}
@@ -6373,7 +6373,7 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return x.length == y.length;}
+Equivalent to: \tcode{return x.\exposid{length} == y.\exposid{length};}
 \end{itemdescr}
 
 \indexlibrarymember{operator==}{counted_iterator}%
@@ -6385,7 +6385,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to: \tcode{return x.length == 0;}
+Equivalent to: \tcode{return x.\exposid{length} == 0;}
 \end{itemdescr}
 
 \indexlibrarymember{operator<=>}{counted_iterator}%
@@ -6403,12 +6403,12 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return y.length <=> x.length;}
+Equivalent to: \tcode{return y.\exposid{length} <=> x.\exposid{length};}
 
 \pnum
 \begin{note}
 The argument order in the \effects element is reversed
-because \tcode{length} counts down, not up.
+because \exposid{length} counts down, not up.
 \end{note}
 \end{itemdescr}
 
@@ -6418,36 +6418,36 @@
 \begin{itemdecl}
 friend constexpr decltype(auto)
   iter_move(const counted_iterator& i)
-    noexcept(noexcept(ranges::iter_move(i.current)))
+    noexcept(noexcept(ranges::iter_move(i.@\exposid{current}@)))
     requires @\libconcept{input_iterator}@<I>;
 \end{itemdecl}
 
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{i.length > 0} is \tcode{true}.
+\tcode{i.\exposid{length} > 0} is \tcode{true}.
 
 \pnum
 \effects
-Equivalent to: \tcode{return ranges::iter_move(i.current);}
+Equivalent to: \tcode{return ranges::iter_move(i.\exposid{current});}
 \end{itemdescr}
 
 \indexlibrarymember{iter_swap}{counted_iterator}%
 \begin{itemdecl}
 template<@\libconcept{indirectly_swappable}@<I> I2>
   friend constexpr void
     iter_swap(const counted_iterator& x, const counted_iterator<I2>& y)
-      noexcept(noexcept(ranges::iter_swap(x.current, y.current)));
+      noexcept(noexcept(ranges::iter_swap(x.@\exposid{current}@, y.@\exposid{current}@)));
 \end{itemdecl}
 
 \begin{itemdescr}
 \pnum
 \hardexpects
-Both \tcode{x.length > 0} and \tcode{y.length > 0} are \tcode{true}.
+Both \tcode{x.\exposid{length} > 0} and \tcode{y.\exposid{length} > 0} are \tcode{true}.
 
 \pnum
 \effects
-Equivalent to \tcode{ranges::iter_swap(x.current, y.current)}.
+Equivalent to \tcode{ranges::iter_swap(x.\exposid{current}, y.\exposid{current})}.
 \end{itemdescr}
 
 \rSec2[unreachable.sentinel]{Unreachable sentinel}