[move.iterators] Exposition-only style for current and last

Author: frederick-vs-ja

source/iterators.tex

@@ -4830,14 +4830,14 @@
         operator-(const move_iterator& x, const move_sentinel<S>& y);
     friend constexpr iter_rvalue_reference_t<Iterator>
       iter_move(const move_iterator& i)
-        noexcept(noexcept(ranges::iter_move(i.current)));
+        noexcept(noexcept(ranges::iter_move(i.@\exposid{current}@)));
     template<@\libconcept{indirectly_swappable}@<Iterator> Iterator2>
       friend constexpr void
         iter_swap(const move_iterator& x, const move_iterator<Iterator2>& y)
-          noexcept(noexcept(ranges::iter_swap(x.current, y.current)));
+          noexcept(noexcept(ranges::iter_swap(x.@\exposid{current}@, y.@\exposid{current}@)));
 
   private:
-    Iterator current;   // \expos
+    Iterator @\exposid{current}@;   // \expos
   };
 }
 \end{codeblock}
@@ -4901,7 +4901,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Value-initializes \tcode{current}.
+Value-initializes \exposid{current}.
 \end{itemdescr}
 
 
@@ -4913,7 +4913,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Initializes \tcode{current} with \tcode{std::move(i)}.
+Initializes \exposid{current} with \tcode{std::move(i)}.
 \end{itemdescr}
 
 
@@ -4930,7 +4930,7 @@
 
 \pnum
 \effects
-Initializes \tcode{current} with \tcode{u.current}.
+Initializes \exposid{current} with \tcode{u.\exposid{current}}.
 \end{itemdescr}
 
 \indexlibrarymember{operator=}{move_iterator}%
@@ -4947,8 +4947,8 @@
 
 \pnum
 \effects
-Assigns \tcode{u.current} to
-\tcode{current}.
+Assigns \tcode{u.\exposid{current}} to
+\exposid{current}.
 
 \pnum
 \returns
@@ -4965,7 +4965,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{current}.
+\exposid{current}.
 \end{itemdescr}
 
 \indexlibrarymember{base}{move_iterator}%
@@ -4976,7 +4976,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{std::move(current)}.
+\tcode{std::move(\exposid{current})}.
 \end{itemdescr}
 
 \rSec3[move.iter.elem]{Element access}
@@ -4989,7 +4989,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to: \tcode{return ranges::iter_move(current);}
+Equivalent to: \tcode{return ranges::iter_move(\exposid{current});}
 \end{itemdescr}
 
 \indexlibrarymember{operator[]}{move_iterator}%
@@ -5000,7 +5000,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to: \tcode{return ranges::iter_move(current + n);}
+Equivalent to: \tcode{return ranges::iter_move(\exposid{current} + n);}
 \end{itemdescr}
 
 \rSec3[move.iter.nav]{Navigation}
@@ -5013,7 +5013,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-As if by \tcode{++current}.
+As if by \tcode{++\exposid{current}}.
 
 \pnum
 \returns
@@ -5031,10 +5031,10 @@
 If \tcode{Iterator} models \libconcept{forward_iterator}, equivalent to:
 \begin{codeblock}
 move_iterator tmp = *this;
-++current;
+++@\exposid{current}@;
 return tmp;
 \end{codeblock}
-Otherwise, equivalent to \tcode{++current}.
+Otherwise, equivalent to \tcode{++\exposid{current}}.
 \end{itemdescr}
 
 \indexlibrarymember{operator--}{move_iterator}%
@@ -5045,7 +5045,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-As if by \tcode{--current}.
+As if by \tcode{--\exposid{current}}.
 
 \pnum
 \returns
@@ -5063,7 +5063,7 @@
 As if by:
 \begin{codeblock}
 move_iterator tmp = *this;
---current;
+--@\exposid{current}@;
 return tmp;
 \end{codeblock}
 \end{itemdescr}
@@ -5076,7 +5076,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{move_iterator(current + n)}.
+\tcode{move_iterator(\exposid{current} + n)}.
 \end{itemdescr}
 
 \indexlibrarymember{operator+=}{move_iterator}%
@@ -5087,7 +5087,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-As if by: \tcode{current += n;}
+As if by: \tcode{\exposid{current} += n;}
 
 \pnum
 \returns
@@ -5102,7 +5102,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{move_iterator(current - n)}.
+\tcode{move_iterator(\exposid{current} - n)}.
 \end{itemdescr}
 
 \indexlibrarymember{operator-=}{move_iterator}%
@@ -5113,7 +5113,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-As if by: \tcode{current -= n;}
+As if by: \tcode{\exposid{current} -= n;}
 
 \pnum
 \returns
@@ -5268,27 +5268,27 @@
 \begin{itemdecl}
 friend constexpr iter_rvalue_reference_t<Iterator>
   iter_move(const move_iterator& i)
-    noexcept(noexcept(ranges::iter_move(i.current)));
+    noexcept(noexcept(ranges::iter_move(i.@\exposid{current}@)));
 \end{itemdecl}
 
 \begin{itemdescr}
 \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}{move_iterator}%
 \begin{itemdecl}
 template<@\libconcept{indirectly_swappable}@<Iterator> Iterator2>
   friend constexpr void
     iter_swap(const move_iterator& x, const move_iterator<Iterator2>& 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
 \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}
 
 \indexlibraryglobal{make_move_iterator}%
@@ -5345,7 +5345,7 @@
     constexpr S base() const;
 
   private:
-    S last;     // \expos
+    S @\exposid{last}@;     // \expos
   };
 }
 \end{codeblock}
@@ -5360,7 +5360,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Value-initializes \tcode{last}.
+Value-initializes \exposid{last}.
 If \tcode{is_trivially_default_constructible_v<S>} is \tcode{true},
 then this constructor is a \keyword{constexpr} constructor.
 \end{itemdescr}
@@ -5373,7 +5373,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Initializes \tcode{last} with \tcode{std::move(s)}.
+Initializes \exposid{last} with \tcode{std::move(s)}.
 \end{itemdescr}
 
 \indexlibraryctor{move_sentinel}%
@@ -5386,7 +5386,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Initializes \tcode{last} with \tcode{s.last}.
+Initializes \exposid{last} with \tcode{s.\exposid{last}}.
 \end{itemdescr}
 
 \indexlibrarymember{operator=}{move_sentinel}%
@@ -5400,7 +5400,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to: \tcode{last = s.last; return *this;}
+Equivalent to: \tcode{\exposid{last} = s.\exposid{last}; return *this;}
 \end{itemdescr}
 
 \indexlibrarymember{base}{move_sentinel}%
@@ -5411,7 +5411,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{last}.
+\exposid{last}.
 \end{itemdescr}
 
 \rSec2[iterators.common]{Common iterators}