[iterators.common] Exposition-only style for v_

Author: frederick-vs-ja

source/iterators.tex

@@ -5493,7 +5493,7 @@
         noexcept(noexcept(ranges::iter_swap(declval<const I&>(), declval<const I2&>())));
 
   private:
-    variant<I, S> v_;   // \expos
+    variant<I, S> @\exposid{v_}@;   // \expos
   };
 
   template<class I, class S>
@@ -5552,7 +5552,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Initializes \tcode{v_} as if by \tcode{v_\{in_place_type<I>, std::move(i)\}}.
+Initializes \exposid{v_} as if by \tcode{\exposid{v_}\{in_place_type<I>, std::move(i)\}}.
 \end{itemdescr}
 
 \indexlibraryctor{common_iterator}%
@@ -5563,8 +5563,8 @@
 \begin{itemdescr}
 \pnum
 \effects
-Initializes \tcode{v_} as if by
-\tcode{v_\{in_place_type<S>, std::move(s)\}}.
+Initializes \exposid{v_} as if by
+\tcode{\exposid{v_}\{in_place_type<S>, std::move(s)\}}.
 \end{itemdescr}
 
 \indexlibraryctor{common_iterator}%
@@ -5577,13 +5577,13 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{x.v_.valueless_by_exception()} is \tcode{false}.
+\tcode{x.\exposid{v_}.valueless_by_exception()} is \tcode{false}.
 
 \pnum
 \effects
-Initializes \tcode{v_} as if by
-\tcode{v_\{in_place_index<$i$>, get<$i$>(x.v_)\}},
-where $i$ is \tcode{x.v_.index()}.
+Initializes \exposid{v_} as if by
+\tcode{\exposid{v_}\{in_place_index<$i$>, get<$i$>(x.\exposid{v_})\}},
+where $i$ is \tcode{x.\exposid{v_}.index()}.
 \end{itemdescr}
 
 \indexlibrarymember{operator=}{common_iterator}%
@@ -5597,18 +5597,18 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{x.v_.valueless_by_exception()} is \tcode{false}.
+\tcode{x.\exposid{v_}.valueless_by_exception()} is \tcode{false}.
 
 \pnum
 \effects
 Equivalent to:
 \begin{itemize}
-\item If \tcode{v_.index() == x.v_.index()}, then
-\tcode{get<$i$>(v_) = get<$i$>(x.v_)}.
+\item If \tcode{\exposid{v_}.index() == x.\exposid{v_}.index()}, then
+\tcode{get<$i$>(\exposid{v_}) = get<$i$>(x.\exposid{v_})}.
 
-\item Otherwise, \tcode{v_.emplace<$i$>(get<$i$>(x.v_))}.
+\item Otherwise, \tcode{\exposid{v_}.emplace<$i$>(get<$i$>(x.\exposid{v_}))}.
 \end{itemize}
-where $i$ is \tcode{x.v_.index()}.
+where $i$ is \tcode{x.\exposid{v_}.index()}.
 
 \pnum
 \returns
@@ -5627,11 +5627,11 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{holds_alternative<I>(v_)} is \tcode{true}.
+\tcode{holds_alternative<I>(\exposid{v_})} is \tcode{true}.
 
 \pnum
 \effects
-Equivalent to: \tcode{return *get<I>(v_);}
+Equivalent to: \tcode{return *get<I>(\exposid{v_});}
 \end{itemdescr}
 
 \indexlibrarymember{operator->}{common_iterator}%
@@ -5652,26 +5652,26 @@
 
 \pnum
 \hardexpects
-\tcode{holds_alternative<I>(v_)} is \tcode{true}.
+\tcode{holds_alternative<I>(\exposid{v_})} is \tcode{true}.
 
 \pnum
 \effects
 \begin{itemize}
 \item
 If \tcode{I} is a pointer type or if the expression
-\tcode{get<I>(v_).operator->()} is
-well-formed, equivalent to: \tcode{return get<I>(v_);}
+\tcode{get<I>(\exposid{v_}).operator->()} is
+well-formed, equivalent to: \tcode{return get<I>(\exposid{v_});}
 
 \item
 Otherwise, if \tcode{iter_reference_t<I>} is a reference type, equivalent to:
 \begin{codeblock}
-auto&& tmp = *get<I>(v_);
+auto&& tmp = *get<I>(@\exposid{v_}@);
 return addressof(tmp);
 \end{codeblock}
 
 \item
 Otherwise, equivalent to:
-\tcode{return \exposid{proxy}(*get<I>(v_));} where
+\tcode{return \exposid{proxy}(*get<I>(\exposid{v_}));} where
 \exposid{proxy} is the exposition-only class:
 \begin{codeblock}
 class @\exposid{proxy}@ {
@@ -5697,11 +5697,11 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{holds_alternative<I>(v_)} is \tcode{true}.
+\tcode{holds_alternative<I>(\exposid{v_})} is \tcode{true}.
 
 \pnum
 \effects
-Equivalent to \tcode{++get<I>(v_)}.
+Equivalent to \tcode{++get<I>(\exposid{v_})}.
 
 \pnum
 \returns
@@ -5716,7 +5716,7 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{holds_alternative<I>(v_)} is \tcode{true}.
+\tcode{holds_alternative<I>(\exposid{v_})} is \tcode{true}.
 
 \pnum
 \effects
@@ -5736,7 +5736,7 @@
 is \tcode{false},
 equivalent to:
 \begin{codeblock}
-return get<I>(v_)++;
+return get<I>(@\exposid{v_}@)++;
 \end{codeblock}
 Otherwise, equivalent to:
 \begin{codeblock}
@@ -5771,14 +5771,14 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{x.v_.valueless_by_exception()} and \tcode{y.v_.valueless_by_exception()}
+\tcode{x.\exposid{v_}.valueless_by_exception()} and \tcode{y.\exposid{v_}.valueless_by_exception()}
 are each \tcode{false}.
 
 \pnum
 \returns
 \tcode{true} if \tcode{$i$ == $j$},
-and otherwise \tcode{get<$i$>(x.v_) == get<$j$>(y.v_)},
-where $i$ is \tcode{x.v_.index()} and $j$ is \tcode{y.v_.index()}.
+and otherwise \tcode{get<$i$>(x.\exposid{v_}) == get<$j$>(y.\exposid{v_})},
+where $i$ is \tcode{x.\exposid{v_}.index()} and $j$ is \tcode{y.\exposid{v_}.index()}.
 \end{itemdescr}
 
 \indexlibrarymember{operator==}{common_iterator}%
@@ -5792,14 +5792,14 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{x.v_.valueless_by_exception()} and \tcode{y.v_.valueless_by_exception()}
+\tcode{x.\exposid{v_}.valueless_by_exception()} and \tcode{y.\exposid{v_}.valueless_by_exception()}
 are each \tcode{false}.
 
 \pnum
 \returns
 \tcode{true} if $i$ and $j$ are each \tcode{1}, and otherwise
-\tcode{get<$i$>(x.v_) == get<$j$>(y.v_)}, where
-$i$ is \tcode{x.v_.index()} and $j$ is \tcode{y.v_.index()}.
+\tcode{get<$i$>(x.\exposid{v_}) == get<$j$>(y.\exposid{v_})}, where
+$i$ is \tcode{x.\exposid{v_}.index()} and $j$ is \tcode{y.\exposid{v_}.index()}.
 \end{itemdescr}
 
 \indexlibrarymember{operator-}{common_iterator}%
@@ -5813,14 +5813,14 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{x.v_.valueless_by_exception()} and \tcode{y.v_.valueless_by_exception()}
+\tcode{x.\exposid{v_}.valueless_by_exception()} and \tcode{y.\exposid{v_}.valueless_by_exception()}
 are each \tcode{false}.
 
 \pnum
 \returns
 \tcode{0} if $i$ and $j$ are each \tcode{1}, and otherwise
-\tcode{get<$i$>(x.v_) - get<$j$>(y.v_)}, where
-$i$ is \tcode{x.v_.index()} and $j$ is \tcode{y.v_.index()}.
+\tcode{get<$i$>(x.\exposid{v_}) - get<$j$>(y.\exposid{v_})}, where
+$i$ is \tcode{x.\exposid{v_}.index()} and $j$ is \tcode{y.\exposid{v_}.index()}.
 \end{itemdescr}
 
 \rSec3[common.iter.cust]{Customizations}
@@ -5835,11 +5835,11 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{holds_alternative<I>(i.v_)} is \tcode{true}.
+\tcode{holds_alternative<I>(i.\exposid{v_})} is \tcode{true}.
 
 \pnum
 \effects
-Equivalent to: \tcode{return ranges::iter_move(get<I>(i.v_));}
+Equivalent to: \tcode{return ranges::iter_move(get<I>(i.\exposid{v_}));}
 \end{itemdescr}
 
 \indexlibrarymember{iter_swap}{common_iterator}%
@@ -5852,12 +5852,12 @@
 \begin{itemdescr}
 \pnum
 \hardexpects
-\tcode{holds_alternative<I>(x.v_)} and \tcode{holds_alternative<I2>(y.v_)}
+\tcode{holds_alternative<I>(x.\exposid{v_})} and \tcode{holds_alternative<I2>(y.\exposid{v_})}
 are each \tcode{true}.
 
 \pnum
 \effects
-Equivalent to \tcode{ranges::iter_swap(get<I>(x.v_), get<I2>(y.v_))}.
+Equivalent to \tcode{ranges::iter_swap(get<I>(x.\exposid{v_}), get<I2>(y.\exposid{v_}))}.
 \end{itemdescr}
 
 \rSec2[default.sentinel]{Default sentinel}