Rephrase table preambles in terms of const types not const values

For example, replace "a (possibly const) value of type X" with "a value
of type X or const X"

Author: jwakely

src/async.tex

@@ -224,7 +224,13 @@
 Let \tcode{ctx} be the execution context returned by the executor's \tcode{context()} member function. An executor becomes invalid when the first call to \tcode{ctx.shutdown()} returns. The effect of calling \tcode{on_work_started}, \tcode{on_work_finished}, \tcode{dispatch}, \tcode{post}, or \tcode{defer} on an invalid executor is undefined. \begin{note} The copy constructor, comparison operators, and \tcode{context()} member function continue to remain valid until \tcode{ctx} is destroyed. \end{note}
 
 \pnum
-In Table~\ref{tab:async.reqmts.executor.requirements}, \tcode{x1} and \tcode{x2} denote (possibly const) values of type \tcode{X}, \tcode{mx1} denotes an xvalue of type \tcode{X}, \tcode{f} denotes a \tcode{MoveConstructible} (\CppXref{moveconstructible}) function object callable with zero arguments, \tcode{a} denotes a (possibly const) value of type \tcode{A} meeting the \tcode{Allocator} requirements (\CppXref{allocator.requirements}), and \tcode{u} denotes an identifier.
+In Table~\ref{tab:async.reqmts.executor.requirements},
+\tcode{x1} and \tcode{x2} denote values of type \tcode{X} or \tcode{const X},
+\tcode{mx1} denotes an xvalue of type \tcode{X},
+\tcode{f} denotes a \tcode{MoveConstructible} (\CppXref{moveconstructible}) function object callable with zero arguments,
+\tcode{a} denotes a value of type \tcode{A} or \tcode{const A}
+where \tcode{A} is a type meeting the \tcode{Allocator} requirements (\CppXref{allocator.requirements}),
+and \tcode{u} denotes an identifier.
 
 \begin{libreqtab3}
 {Executor requirements}
@@ -395,7 +401,14 @@
 An associator shall be a class template that takes two template type arguments. The first template argument is the source type \tcode{S}. The second template argument is the candidate type \tcode{C}. The second template argument shall be defaulted to some default candidate type \tcode{D} that satisfies the type requirements \tcode{R}.
 
 \pnum
-An associator shall additionally satisfy the requirements in Table~\ref{tab:async.reqmts.associator.requirements}. In this table, \tcode{X} is a class template that meets the associator requirements, \tcode{S} is the source type, \tcode{s} is a (possibly const) value of type \tcode{S}, \tcode{C} is the candidate type, \tcode{c} is a (possibly const) value of type \tcode{C}, \tcode{D} is the default candidate type, and \tcode{d} is a (possibly const) value of type \tcode{D} that is the default candidate object.
+An associator shall additionally satisfy the requirements in Table~\ref{tab:async.reqmts.associator.requirements}.
+In this table, \tcode{X} is a class template that meets the associator requirements,
+\tcode{S} is the source type,
+\tcode{s} is a value of type \tcode{S} or \tcode{const S},
+\tcode{C} is the candidate type,
+\tcode{c} is a value of type \tcode{C} or \tcode{const C},
+\tcode{D} is the default candidate type,
+and \tcode{d} is a value of type \tcode{D} or \tcode{const D} that is the default candidate object.
 
 \begin{libreqtab3}
 {Associator requirements}
@@ -921,7 +934,11 @@
 
 \indextext{requirements!\idxcode{associated_allocator} specializations}%
 \pnum
-Specializations of \tcode{associated_allocator} shall satisfy the requirements in Table~\ref{tab:async.assoc.alloc.requirements}. In this table, \tcode{X} is a specialization of \tcode{associated_allocator} for the template parameters \tcode{T} and \tcode{ProtoAllocator}; \tcode{t} is a value of (possibly const) \tcode{T}; and \tcode{a} is an object of type \tcode{ProtoAllocator}.
+Specializations of \tcode{associated_allocator} shall satisfy the requirements in Table~\ref{tab:async.assoc.alloc.requirements}.
+In this table, \tcode{X} is a specialization of \tcode{associated_allocator}
+for the template parameters \tcode{T} and \tcode{ProtoAllocator};
+\tcode{t} is a value of type \tcode{T} or \tcode{const T};
+and \tcode{a} is an object of type \tcode{ProtoAllocator}.
 
 \begin{libreqtab3}
 {\tcode{associated_allocator} specialization requirements}
@@ -1378,7 +1395,11 @@
 
 \indextext{requirements!\idxcode{associated_executor} specializations}%
 \pnum
-Specializations of \tcode{associated_executor} shall satisfy the requirements in Table~\ref{tab:async.assoc.exec.requirements}. In this table, \tcode{X} is a specialization of \tcode{associated_executor} for the template parameters \tcode{T} and \tcode{Executor}; \tcode{t} is a value of (possibly const) \tcode{T}; and \tcode{e} is an object of type \tcode{Executor}.
+Specializations of \tcode{associated_executor} shall satisfy the requirements in Table~\ref{tab:async.assoc.exec.requirements}.
+In this table, \tcode{X} is a specialization of \tcode{associated_executor}
+for the template parameters \tcode{T} and \tcode{Executor};
+\tcode{t} is a value of \tcode{T} or \tcode{const T};
+and \tcode{e} is an object of type \tcode{Executor}.
 
 \begin{libreqtab3}
 {\tcode{associated_executor} specialization requirements}

src/buffers.tex

@@ -315,8 +315,9 @@
 A type \tcode{X} meets the \tcode{MutableBufferSequence} requirements if it satisfies the requirements of \tcode{Destructible} (\CppXref{destructible}) and \tcode{CopyConstructible} (\CppXref{copyconstructible}), as well as the additional requirements listed in Table~\ref{tab:buffer.reqmts.mutablebuffersequence.requirements}.
 
 \pnum
-In Table~\ref{tab:buffer.reqmts.mutablebuffersequence.requirements}, \tcode{x}
-denotes a (possibly const) value of type \tcode{X}, and \tcode{u} denotes an identifier.
+In Table~\ref{tab:buffer.reqmts.mutablebuffersequence.requirements},
+\tcode{x} denotes a value of type \tcode{X} or \tcode{const X},
+and \tcode{u} denotes an identifier.
 
 \indextext{requirements!\idxcode{MutableBufferSequence}}%
 \begin{LongTable}
@@ -377,7 +378,9 @@
 A type \tcode{X} meets the \tcode{ConstBufferSequence} requirements if it satisfies the requirements of \tcode{Destructible} (\CppXref{destructible}) and \tcode{CopyConstructible} (\CppXref{copyconstructible}), as well as the additional requirements listed in Table~\ref{tab:buffer.reqmts.constbuffersequence.requirements}.
 
 \pnum
-In Table~\ref{tab:buffer.reqmts.constbuffersequence.requirements}, \tcode{x} denotes a (possibly const) value of type \tcode{X}, and \tcode{u} denotes an identifier.
+In Table~\ref{tab:buffer.reqmts.constbuffersequence.requirements},
+\tcode{x} denotes a value of type \tcode{X} or \tcode{const X},
+and \tcode{u} denotes an identifier.
 
 \indextext{requirements!\idxcode{ConstBufferSequence}}%
 \begin{LongTable}
@@ -441,7 +444,10 @@
 A type \tcode{X} meets the \tcode{DynamicBuffer} requirements if it satisfies the requirements of \tcode{Destructible} (\CppXref{destructible}) and \tcode{MoveConstructible} (\CppXref{moveconstructible}), as well as the additional requirements listed in Table~\ref{tab:buffer.reqmts.dynamicbuffer.requirements}.
 
 \pnum
-In Table~\ref{tab:buffer.reqmts.dynamicbuffer.requirements}, \tcode{x} denotes a value of type \tcode{X}, \tcode{x1} denotes a (possibly const) value of type \tcode{X}, and \tcode{n} denotes a (possibly const) value of type \tcode{size_t}.
+In Table~\ref{tab:buffer.reqmts.dynamicbuffer.requirements},
+\tcode{x} denotes a value of type \tcode{X},
+\tcode{x1} denotes a value of type \tcode{X} or \tcode{const X},
+and \tcode{n} denotes a value of type \tcode{size_t} or \tcode{const size_t}.
 
 \indextext{requirements!\idxcode{DynamicBuffer}}%
 \begin{libreqtab3}

src/bufferstreams.tex

@@ -14,7 +14,10 @@
 A type \tcode{X} meets the \tcode{SyncReadStream} requirements if it satisfies the requirements listed in Table~\ref{tab:buffer.stream.reqmts.syncreadstream.requirements}.
 
 \pnum
-In Table~\ref{tab:buffer.stream.reqmts.syncreadstream.requirements}, \tcode{a} denotes a value of type \tcode{X}, \tcode{mb} denotes a (possibly const) value satisfying the \tcode{MutableBufferSequence}~(\ref{buffer.reqmts.mutablebuffersequence}) requirements, and \tcode{ec} denotes an object of type \tcode{error_code}.
+In Table~\ref{tab:buffer.stream.reqmts.syncreadstream.requirements},
+\tcode{a} denotes a value of type \tcode{X},
+\tcode{mb} denotes a value of a (possibly const) type satisfying the \tcode{MutableBufferSequence}~(\ref{buffer.reqmts.mutablebuffersequence}) requirements,
+and \tcode{ec} denotes an object of type \tcode{error_code}.
 
 \indexlibrary{\idxcode{read_some}}%
 \begin{libreqtab3}
@@ -49,7 +52,9 @@
 A type \tcode{X} meets the \tcode{AsyncReadStream} requirements if it satisfies the requirements listed below.
 
 \pnum
-In the table below, \tcode{a} denotes a value of type \tcode{X}, \tcode{mb} denotes a (possibly const) value satisfying the \tcode{MutableBufferSequence}~(\ref{buffer.reqmts.mutablebuffersequence}) requirements, and \tcode{t} is a completion token.
+In the table below, \tcode{a} denotes a value of type \tcode{X},
+\tcode{mb} denotes a value of a (possibly const) type satisfying the \tcode{MutableBufferSequence}~(\ref{buffer.reqmts.mutablebuffersequence}) requirements,
+and \tcode{t} is a completion token.
 
 \indexlibrary{\idxcode{get_executor}}%
 \indexlibrary{\idxcode{async_read_some}}%
@@ -88,7 +93,10 @@
 A type \tcode{X} meets the \tcode{SyncWriteStream} requirements if it satisfies the requirements listed below.
 
 \pnum
-In the table below, \tcode{a} denotes a value of type \tcode{X}, \tcode{cb} denotes a (possibly const) value satisfying the \tcode{ConstBufferSequence}~(\ref{buffer.reqmts.constbuffersequence}) requirements, and \tcode{ec} denotes an object of type \tcode{error_code}.
+In the table below,
+\tcode{a} denotes a value of type \tcode{X},
+\tcode{cb} denotes a value of a (possibly const) type satisfying the \tcode{ConstBufferSequence}~(\ref{buffer.reqmts.constbuffersequence}) requirements,
+and \tcode{ec} denotes an object of type \tcode{error_code}.
 
 \indexlibrary{\idxcode{write_some}}%
 \begin{libreqtab3}
@@ -124,7 +132,10 @@
 A type \tcode{X} meets the \tcode{AsyncWriteStream} requirements if it satisfies the requirements listed below.
 
 \pnum
-In the table below, \tcode{a} denotes a value of type \tcode{X}, \tcode{cb} denotes a (possibly const) value satisfying the \tcode{ConstBufferSequence}~(\ref{buffer.reqmts.constbuffersequence}) requirements, and \tcode{t} is a completion token.
+In the table below,
+\tcode{a} denotes a value of type \tcode{X},
+\tcode{cb} denotes a value of a (possibly const) type satisfying the \tcode{ConstBufferSequence}~(\ref{buffer.reqmts.constbuffersequence}) requirements,
+and \tcode{t} is a completion token.
 
 \indexlibrary{\idxcode{get_executor}}%
 \indexlibrary{\idxcode{async_write_some}}%
@@ -167,7 +178,9 @@
 A type \tcode{X} meets the \tcode{CompletionCondition} requirements if it satisfies the requirements of \tcode{Destructible} (\CppXref{destructible}) and \tcode{CopyConstructible} (\CppXref{copyconstructible}), as well as the additional requirements listed below.
 
 \pnum
-In the table below, \tcode{x} denotes a value of type \tcode{X}, \tcode{ec} denotes a (possibly const) value of type \tcode{error_code}, and \tcode{n} denotes a (possibly const) value of type \tcode{size_t}.
+In the table below, \tcode{x} denotes a value of type \tcode{X},
+\tcode{ec} denotes a value of type \tcode{error_code} or \tcode{const error_code},
+and \tcode{n} denotes a value of type \tcode{size_t} or \tcode{const size_t}.
 
 \begin{libreqtab3}
 {CompletionCondition requirements}

src/internetprotocol.tex

@@ -289,7 +289,8 @@
 A type \tcode{X} meets the \tcode{InternetProtocol} requirements if it satisfies the requirements of \tcode{AcceptableProtocol}~(\ref{socket.reqmts.acceptableprotocol}), as well as the additional requirements listed below.
 
 \pnum
-In the table below, \tcode{a} denotes a (possibly const) value of type \tcode{X}, and \tcode{b} denotes a (possibly const) value of type \tcode{X}.
+In the table below,
+\tcode{a} and \tcode{b} denote values of type \tcode{X} or \tcode{const X}.
 
 \begin{libreqtab3}
 {InternetProtocol requirements}
@@ -338,7 +339,13 @@
 A type \tcode{X} meets the \tcode{MulticastGroupSocketOption} requirements if it satisfies the requirements of \tcode{Destructible} (\CppXref{destructible}), \tcode{CopyConstructible} (\CppXref{copyconstructible}), \tcode{CopyAssignable} (\CppXref{copyassignable}), and \tcode{SettableSocketOption}~(\ref{socket.reqmts.settablesocketoption}), as well as the additional requirements listed below.
 
 \pnum
-In the table below, \tcode{a} denotes a (possibly const) value of type \tcode{X}, \tcode{b} denotes a (possibly const) value of type \tcode{address}, \tcode{c} and \tcode{d} denote (possibly const) values of type \tcode{address_v4}, \tcode{e} denotes a (possibly const) value of type \tcode{address_v6}, \tcode{f} denotes a (possibly const) value of type \tcode{unsigned int}, and \tcode{u} denotes an identifier.
+In the table below,
+\tcode{a} denotes a value of type \tcode{X} or \tcode{const X},
+\tcode{b} denotes a value of type \tcode{address} or \tcode{const address},
+\tcode{c} and \tcode{d} denote values of type \tcode{address_v4} or \tcode{const address_v4},
+\tcode{e} denotes a value of type \tcode{address_v6} or \tcode{const address_v6},
+\tcode{f} denotes a value of type \tcode{unsigned int} or \tcode{const unsigned int},
+and \tcode{u} denotes an identifier.
 
 \begin{libreqtab3}
 {MulticastGroupSocketOption requirements}
@@ -4104,7 +4111,10 @@
 \rSec1[internet.socket.opt]{Internet socket options}
 
 \pnum
-In Table~\ref{tab:internet.socket.opt.requirements}, let \placeholder{C} denote a socket option class; let \placeholder{L} identify the POSIX macro to be passed as the \tcode{level} argument to POSIX \tcode{setsockopt} and getsockopt; let \placeholder{N} identify the POSIX macro to be passed as the \tcode{option_name} argument to POSIX \tcode{setsockopt} and \tcode{getsockopt}; let \placeholder{T} identify the type of the value whose address will be passed as the \tcode{option_value} argument to POSIX \tcode{setsockopt} and \tcode{getsockopt}; let \tcode{p} denote a (possibly const) value of a type meeting the protocol~(\ref{socket.reqmts.protocol}) requirements, as passed to the socket option's \tcode{level} and \tcode{name} member functions; and let \tcode{F} be the value of \tcode{p.family()}.
+In Table~\ref{tab:internet.socket.opt.requirements}, let \placeholder{C} denote a socket option class; let \placeholder{L} identify the POSIX macro to be passed as the \tcode{level} argument to POSIX \tcode{setsockopt} and getsockopt; let \placeholder{N} identify the POSIX macro to be passed as the \tcode{option_name} argument to POSIX \tcode{setsockopt} and \tcode{getsockopt}; let \placeholder{T} identify the type of the value whose address will be passed as the \tcode{option_value} argument to POSIX \tcode{setsockopt} and \tcode{getsockopt};
+let \tcode{p} denote a value of a (possibly const) type meeting the protocol~(\ref{socket.reqmts.protocol}) requirements,
+as passed to the socket option's \tcode{level} and \tcode{name} member functions;
+and let \tcode{F} be the value of \tcode{p.family()}.
 
 \begin{LongTable}
 {Internet socket options}