[out.ptr.t] Exposition-only style for s, a, and p

Author: frederick-vs-ja

source/memory.tex

@@ -5472,9 +5472,9 @@
     operator void**() const noexcept;
 
   private:
-    Smart& s;                   // \expos
-    tuple<Args...> a;           // \expos
-    Pointer p;                  // \expos
+    Smart& @\exposid{s}@;                   // \expos
+    tuple<Args...> @\exposid{a}@;           // \expos
+    Pointer @\exposid{p}@;                  // \expos
   };
 }
 \end{codeblock}
@@ -5508,23 +5508,23 @@
 \begin{itemdescr}
 \pnum
 \effects
-Initializes \tcode{s} with \tcode{smart},
-\tcode{a} with \tcode{std::forward<Args>(args)...}, and
-value-initializes \tcode{p}.
+Initializes \exposid{s} with \tcode{smart},
+\exposid{a} with \tcode{std::forward<Args>(args)...}, and
+value-initializes \exposid{p}.
 Then, equivalent to:
 \begin{itemize}
 \item
 % pretend to \item that there is real text here, but undo the vertical spacing
 \mbox{}\vspace{-\baselineskip}\vspace{-\parskip}
 \begin{codeblock}
-s.reset();
+@\exposid{s}@.reset();
 \end{codeblock}
-if the expression \tcode{s.reset()} is well-formed;
+if the expression \tcode{\exposid{s}.reset()} is well-formed;
 
 \item
 otherwise,
 \begin{codeblock}
-s = Smart();
+@\exposid{s}@ = Smart();
 \end{codeblock}
 if \tcode{is_constructible_v<Smart>} is \tcode{true};
 
@@ -5562,20 +5562,20 @@
 % pretend to \item that there is real text here, but undo the vertical spacing
 \mbox{}\vspace{-\baselineskip}\vspace{-\parskip}
 \begin{codeblock}
-if (p) {
+if (@\exposid{p}@) {
   apply([&](auto&&... args) {
-    s.reset(static_cast<SP>(p), std::forward<Args>(args)...); }, std::move(a));
+    @\exposid{s}@.reset(static_cast<SP>(@\exposid{p}@), std::forward<Args>(args)...); }, std::move(@\exposid{a}@));
 }
 \end{codeblock}
 if the expression
-\tcode{s.reset(static_cast<SP>(p), std::forward<Args>(args)...)}
+\tcode{\exposid{s}.reset(static_cast<SP>(\exposid{p}), std::forward<Args>(args)...)}
 is well-\linebreak formed;
 \item
 otherwise,
 \begin{codeblock}
-if (p) {
+if (@\exposid{p}@) {
   apply([&](auto&&... args) {
-    s = Smart(static_cast<SP>(p), std::forward<Args>(args)...); }, std::move(a));
+    @\exposid{s}@ = Smart(static_cast<SP>(@\exposid{p}@), std::forward<Args>(args)...); }, std::move(@\exposid{a}@));
 }
 \end{codeblock}
 if \tcode{is_constructible_v<Smart, SP, Args...>} is \tcode{true};
@@ -5595,7 +5595,7 @@
 
 \pnum
 \returns
-\tcode{addressof(const_cast<Pointer\&>(p))}.
+\tcode{addressof(const_cast<Pointer\&>(\exposid{p}))}.
 \end{itemdescr}
 
 \begin{itemdecl}
@@ -5620,12 +5620,12 @@
 A pointer value \tcode{v} such that:
 \begin{itemize}
 \item
-the initial value \tcode{*v} is equivalent to \tcode{static_cast<void*>(p)} and
+the initial value \tcode{*v} is equivalent to \tcode{static_cast<void*>(\exposid{p})} and
 \item
 any modification of \tcode{*v}
 that is not followed by a subsequent modification of \tcode{*this}
-affects the value of \tcode{p} during the destruction of \tcode{*this},
-such that \tcode{static_cast<void*>(p) == *v}.
+affects the value of \exposid{p} during the destruction of \tcode{*this},
+such that \tcode{static_cast<void*>(\exposid{p}) == *v}.
 \end{itemize}
 
 \pnum