[thread.lock.unique] Exposition-only style for pm and owns

Author: frederick-vs-ja

source/threads.tex

@@ -8400,8 +8400,8 @@
     mutex_type* mutex() const noexcept;
 
   private:
-    mutex_type* pm;             // \expos
-    bool owns;                  // \expos
+    mutex_type* @\exposid{pm}@;             // \expos
+    bool @\exposid{owns}@;                  // \expos
   };
 }
 \end{codeblock}
@@ -8412,8 +8412,8 @@
 construction or after construction, and may be transferred, after
 acquisition, to another \tcode{unique_lock} object. Objects of type \tcode{unique_lock} are not
 copyable but are movable. The behavior of a program is undefined if the contained pointer
-\tcode{pm} is not null and the lockable object pointed
-to by \tcode{pm} does not exist for the entire remaining
+\exposid{pm} is not null and the lockable object pointed
+to by \exposid{pm} does not exist for the entire remaining
 lifetime\iref{basic.life} of the \tcode{unique_lock} object. The supplied
 \tcode{Mutex} type shall meet the \oldconcept{BasicLockable}
 requirements\iref{thread.req.lockable.basic}.
@@ -8438,7 +8438,7 @@
 \begin{itemdescr}
 \pnum
 \ensures
-\tcode{pm == nullptr} and \tcode{owns == false}.
+\tcode{\exposid{pm} == nullptr} and \tcode{\exposid{owns} == false}.
 \end{itemdescr}
 
 \indexlibraryctor{unique_lock}%
@@ -8453,7 +8453,7 @@
 
 \pnum
 \ensures
-\tcode{pm == addressof(m)} and \tcode{owns == true}.
+\tcode{\exposid{pm} == addressof(m)} and \tcode{\exposid{owns} == true}.
 \end{itemdescr}
 
 \indexlibraryctor{unique_lock}%
@@ -8464,7 +8464,7 @@
 \begin{itemdescr}
 \pnum
 \ensures
-\tcode{pm == addressof(m)} and \tcode{owns == false}.
+\tcode{\exposid{pm} == addressof(m)} and \tcode{\exposid{owns} == false}.
 \end{itemdescr}
 
 \indexlibraryctor{unique_lock}%
@@ -8484,7 +8484,7 @@
 
 \pnum
 \ensures
-\tcode{pm == addressof(m)} and \tcode{owns == res},
+\tcode{\exposid{pm} == addressof(m)} and \tcode{o\exposid{owns}wns == res},
 where \tcode{res} is the value returned by the call to \tcode{m.try_lock()}.
 \end{itemdescr}
 
@@ -8500,7 +8500,7 @@
 
 \pnum
 \ensures
-\tcode{pm == addressof(m)} and \tcode{owns == true}.
+\tcode{\exposid{pm} == addressof(m)} and \tcode{\exposid{owns} == true}.
 
 \pnum
 \throws
@@ -8525,7 +8525,7 @@
 
 \pnum
 \ensures
-\tcode{pm == addressof(m)} and \tcode{owns == res},
+\tcode{\exposid{pm} == addressof(m)} and \tcode{\exposid{owns} == res},
 where \tcode{res} is
 the value returned by the call to \tcode{m.try_lock_until(abs_time)}.
 \end{itemdescr}
@@ -8547,7 +8547,7 @@
 
 \pnum
 \ensures
-\tcode{pm == addressof(m)} and \tcode{owns == res},
+\tcode{\exposid{pm} == addressof(m)} and \tcode{\exposid{owns} == res},
 where \tcode{res} is the value returned by the call to \tcode{m.try_lock_for(rel_time)}.
 \end{itemdescr}
 
@@ -8559,7 +8559,7 @@
 \begin{itemdescr}
 \pnum
 \ensures
-\tcode{pm == u_p.pm} and \tcode{owns == u_p.owns} (where \tcode{u_p} is the state of \tcode{u} just prior to this construction),  \tcode{u.pm == 0} and \tcode{u.owns == false}.
+\tcode{\exposid{pm} == u_p.\exposid{pm}} and \tcode{\exposid{owns} == u_p.\exposid{owns}} (where \tcode{u_p} is the state of \tcode{u} just prior to this construction),  \tcode{u.\exposid{pm} == 0} and \tcode{u.\exposid{owns} == false}.
 \end{itemdescr}
 
 \indexlibrarymember{operator=}{unique_lock}%
@@ -8585,7 +8585,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-If \tcode{owns} calls \tcode{pm->unlock()}.
+If \exposid{owns} calls \tcode{\exposid{pm}->unlock()}.
 \end{itemdescr}
 
 \rSec4[thread.lock.unique.locking]{Locking}
@@ -8598,22 +8598,22 @@
 \begin{itemdescr}
 \pnum
 \effects
-As if by \tcode{pm->lock()}.
+As if by \tcode{\exposid{pm}->lock()}.
 
 \pnum
 \ensures
-\tcode{owns == true}.
+\tcode{\exposid{owns} == true}.
 
 \pnum
 \throws
-Any exception thrown by \tcode{pm->lock()}. \tcode{system_error} when an exception
+Any exception thrown by \tcode{\exposid{pm}->lock()}. \tcode{system_error} when an exception
 is required\iref{thread.req.exception}.
 
 \pnum
 \errors
 \begin{itemize}
-\item \tcode{operation_not_permitted} --- if \tcode{pm} is \keyword{nullptr}.
-\item \tcode{resource_deadlock_would_occur} --- if on entry \tcode{owns}
+\item \tcode{operation_not_permitted} --- if \exposid{pm} is \keyword{nullptr}.
+\item \tcode{resource_deadlock_would_occur} --- if on entry \exposid{owns}
 is \tcode{true}.
 \end{itemize}
 \end{itemdescr}
@@ -8631,27 +8631,27 @@
 
 \pnum
 \effects
-As if by \tcode{pm->try_lock()}.
+As if by \tcode{\exposid{pm}->try_lock()}.
 
 \pnum
 \ensures
-\tcode{owns == res}, where \tcode{res} is the value returned by
-\tcode{pm->try_lock()}.
+\tcode{\exposid{owns} == res}, where \tcode{res} is the value returned by
+\tcode{\exposid{pm}->try_lock()}.
 
 \pnum
 \returns
-The value returned by \tcode{pm->try_lock()}.
+The value returned by \tcode{\exposid{pm}->try_lock()}.
 
 \pnum
 \throws
-Any exception thrown by \tcode{pm->try_lock()}. \tcode{system_error} when an exception
+Any exception thrown by \tcode{\exposid{pm}->try_lock()}. \tcode{system_error} when an exception
 is required\iref{thread.req.exception}.
 
 \pnum
 \errors
 \begin{itemize}
-\item \tcode{operation_not_permitted} --- if \tcode{pm} is \keyword{nullptr}.
-\item \tcode{resource_deadlock_would_occur} --- if on entry \tcode{owns}
+\item \tcode{operation_not_permitted} --- if \exposid{pm} is \keyword{nullptr}.
+\item \tcode{resource_deadlock_would_occur} --- if on entry \exposid{owns}
 is \tcode{true}.
 \end{itemize}
 \end{itemdescr}
@@ -8670,27 +8670,27 @@
 
 \pnum
 \effects
-As if by \tcode{pm->try_lock_until(abs_time)}.
+As if by \tcode{\exposid{pm}->try_lock_until(abs_time)}.
 
 \pnum
 \ensures
-\tcode{owns == res}, where \tcode{res} is the value returned by
-\tcode{pm->try_lock_until(abs_time)}.
+\tcode{\exposid{owns} == res}, where \tcode{res} is the value returned by
+\tcode{\exposid{pm}->try_lock_until(abs_time)}.
 
 \pnum
 \returns
-The value returned by \tcode{pm->try_lock_until(abs_time)}.
+The value returned by \tcode{\exposid{pm}->try_lock_until(abs_time)}.
 
 \pnum
 \throws
-Any exception thrown by \tcode{pm->try_lock_until(abstime)}. \tcode{system_error} when an
+Any exception thrown by \tcode{\exposid{pm}->try_lock_until(abstime)}. \tcode{system_error} when an
 exception is required\iref{thread.req.exception}.
 
 \pnum
 \errors
 \begin{itemize}
-\item \tcode{operation_not_permitted} --- if \tcode{pm} is \keyword{nullptr}.
-\item \tcode{resource_deadlock_would_occur} --- if on entry \tcode{owns} is
+\item \tcode{operation_not_permitted} --- if \exposid{pm} is \keyword{nullptr}.
+\item \tcode{resource_deadlock_would_occur} --- if on entry \exposid{owns} is
 \tcode{true}.
 \end{itemize}
 \end{itemdescr}
@@ -8708,26 +8708,26 @@
 
 \pnum
 \effects
-As if by \tcode{pm->try_lock_for(rel_time)}.
+As if by \tcode{\exposid{pm}->try_lock_for(rel_time)}.
 
 \pnum
 \ensures
-\tcode{owns == res}, where \tcode{res} is the value returned by \tcode{pm->try_lock_for(rel_time)}.
+\tcode{\exposid{owns} == res}, where \tcode{res} is the value returned by \tcode{\exposid{pm}->try_lock_for(rel_time)}.
 
 \pnum
 \returns
-The value returned by \tcode{pm->try_lock_for(rel_time)}.
+The value returned by \tcode{\exposid{pm}->try_lock_for(rel_time)}.
 
 \pnum
 \throws
-Any exception thrown by \tcode{pm->try_lock_for(rel_time)}. \tcode{system_error} when an
+Any exception thrown by \tcode{\exposid{pm}->try_lock_for(rel_time)}. \tcode{system_error} when an
 exception is required\iref{thread.req.exception}.
 
 \pnum
 \errors
 \begin{itemize}
-\item \tcode{operation_not_permitted} --- if \tcode{pm} is \keyword{nullptr}.
-\item \tcode{resource_deadlock_would_occur} --- if on entry \tcode{owns} is
+\item \tcode{operation_not_permitted} --- if \exposid{pm} is \keyword{nullptr}.
+\item \tcode{resource_deadlock_would_occur} --- if on entry \exposid{owns} is
 \tcode{true}.
 \end{itemize}
 \end{itemdescr}
@@ -8740,11 +8740,11 @@
 \begin{itemdescr}
 \pnum
 \effects
-As if by \tcode{pm->unlock()}.
+As if by \tcode{\exposid{pm}->unlock()}.
 
 \pnum
 \ensures
-\tcode{owns == false}.
+\tcode{\exposid{owns} == false}.
 
 \pnum
 \throws
@@ -8754,7 +8754,7 @@
 \pnum
 \errors
 \begin{itemize}
-\item \tcode{operation_not_permitted} --- if on entry \tcode{owns} is \tcode{false}.
+\item \tcode{operation_not_permitted} --- if on entry \exposid{owns} is \tcode{false}.
 \end{itemize}
 \end{itemdescr}
 
@@ -8779,11 +8779,11 @@
 \begin{itemdescr}
 \pnum
 \ensures
-\tcode{pm == 0} and \tcode{owns == false}.
+\tcode{\exposid{pm} == 0} and \tcode{\exposid{owns} == false}.
 
 \pnum
 \returns
-The previous value of \tcode{pm}.
+The previous value of \exposid{pm}.
 \end{itemdescr}
 
 \indexlibrarymember{swap}{unique_lock}%
@@ -8808,7 +8808,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{owns}.
+\exposid{owns}.
 \end{itemdescr}
 
 \indexlibrarymember{operator bool}{unique_lock}%
@@ -8830,7 +8830,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{pm}.
+\exposid{pm}.
 \end{itemdescr}
 
 \rSec3[thread.lock.shared]{Class template \tcode{shared_lock}}