[over.built] Replace \placeholder{VQ} with \cvqual{vq}.

Introduce \cvqual{vq} once in the introductory text of the section.

Author: jensmaurer

source/overloading.tex

@@ -3441,62 +3441,53 @@
 integral promotions.
 \end{note}
 
+\pnum
+In the remainder of this section, \cvqual{vq} represents either
+\tcode{volatile} or no cv-qualifier.
+
 \pnum
 For every pair
 (\tcode{\placeholder{T}},
-\tcode{\placeholder{VQ}}),
+\cvqual{vq}),
 where
 \tcode{\placeholder{T}}
-is an arithmetic type other than \tcode{bool}, and
-\tcode{\placeholder{VQ}}
-is either
-\tcode{volatile}
-or empty,
+is an arithmetic type other than \tcode{bool},
 there exist candidate operator functions of the form
 
 \begin{codeblock}
-@\placeholder{VQ T}@& operator++(@\placeholder{VQ T}@&);
-@\placeholder{T}@ operator++(@\placeholder{VQ T}@&, int);
+@\cvqual{vq} \placeholder{T}@& operator++(@\cvqual{vq} \placeholder{T}@&);
+@\placeholder{T}@ operator++(@\cvqual{vq} \placeholder{T}@&, int);
 \end{codeblock}
 
 \pnum
 For every pair
 (\tcode{\placeholder{T}},
-\tcode{\placeholder{VQ}}),
+\cvqual{vq}),
 where
 \tcode{\placeholder{T}}
 is an arithmetic type other than
 \tcode{bool},
-and
-\tcode{\placeholder{VQ}}
-is either
-\tcode{volatile}
-or empty,
 there exist candidate operator functions of the form
 
 \begin{codeblock}
-@\placeholder{VQ T}@& operator--(@\placeholder{VQ T}@&);
-@\placeholder{T}@ operator--(@\placeholder{VQ T}@&, int);
+@\cvqual{vq} \placeholder{T}@& operator--(@\cvqual{vq} \placeholder{T}@&);
+@\placeholder{T}@ operator--(@\cvqual{vq} \placeholder{T}@&, int);
 \end{codeblock}
 
 \pnum
 For every pair
 (\tcode{\placeholder{T}},
-\tcode{\placeholder{VQ}}),
+\cvqual{vq}),
 where
 \tcode{\placeholder{T}}
-is a cv-qualified or cv-unqualified object type, and
-\tcode{\placeholder{VQ}}
-is either
-\tcode{volatile}
-or empty,
+is a cv-qualified or cv-unqualified object type,
 there exist candidate operator functions of the form
 
 \begin{codeblock}
-@\placeholder{T}@*@\placeholder{VQ}@& operator++(@\placeholder{T}@*@\placeholder{VQ}@&);
-@\placeholder{T}@*@\placeholder{VQ}@& operator--(@\placeholder{T}@*@\placeholder{VQ}@&);
-@\placeholder{T}@*    operator++(@\placeholder{T}@*@\placeholder{VQ}@&, int);
-@\placeholder{T}@*    operator--(@\placeholder{T}@*@\placeholder{VQ}@&, int);
+@\placeholder{T}@*@\cvqual{vq}@& operator++(@\placeholder{T}@*@\cvqual{vq}@&);
+@\placeholder{T}@*@\cvqual{vq}@& operator--(@\placeholder{T}@*@\cvqual{vq}@&);
+@\placeholder{T}@*    operator++(@\placeholder{T}@*@\cvqual{vq}@&, int);
+@\placeholder{T}@*    operator--(@\placeholder{T}@*@\cvqual{vq}@&, int);
 \end{codeblock}
 
 \pnum
@@ -3667,95 +3658,79 @@
 \pnum
 For every triple
 (\tcode{\placeholder{L}},
-\tcode{\placeholder{VQ}},
+\cvqual{vq},
 \tcode{\placeholder{R}}),
 where
 \tcode{\placeholder{L}}
 is an arithmetic type,
-\tcode{\placeholder{VQ}}
-is either
-\tcode{volatile}
-or empty,
 and
 \tcode{\placeholder{R}}
 is a promoted arithmetic type,
 there exist candidate operator functions of the form
 
 \begin{codeblock}
-@\placeholder{VQ L}@&   operator=(@\placeholder{VQ L}@&, @\placeholder{R}@);
-@\placeholder{VQ L}@&   operator*=(@\placeholder{VQ L}@&, @\placeholder{R}@);
-@\placeholder{VQ L}@&   operator/=(@\placeholder{VQ L}@&, @\placeholder{R}@);
-@\placeholder{VQ L}@&   operator+=(@\placeholder{VQ L}@&, @\placeholder{R}@);
-@\placeholder{VQ L}@&   operator-=(@\placeholder{VQ L}@&, @\placeholder{R}@);
+@\cvqual{vq} \placeholder{L}@&   operator=(@\cvqual{vq} \placeholder{L}@&, @\placeholder{R}@);
+@\cvqual{vq} \placeholder{L}@&   operator*=(@\cvqual{vq} \placeholder{L}@&, @\placeholder{R}@);
+@\cvqual{vq} \placeholder{L}@&   operator/=(@\cvqual{vq} \placeholder{L}@&, @\placeholder{R}@);
+@\cvqual{vq} \placeholder{L}@&   operator+=(@\cvqual{vq} \placeholder{L}@&, @\placeholder{R}@);
+@\cvqual{vq} \placeholder{L}@&   operator-=(@\cvqual{vq} \placeholder{L}@&, @\placeholder{R}@);
 \end{codeblock}
 
 \pnum
-For every pair (\tcode{\placeholder{T}}, \tcode{\placeholder{VQ}}), where \tcode{\placeholder{T}} is any type and \tcode{\placeholder{VQ}} is either
-\tcode{volatile} or empty, there exist candidate operator functions of the form
+For every pair (\tcode{\placeholder{T}}, \cvqual{vq}),
+where \tcode{\placeholder{T}} is any type,
+there exist candidate operator functions of the form
 
 \begin{codeblock}
-@\placeholder{T}@*@\placeholder{VQ}@&   operator=(@\placeholder{T}@*@\placeholder{VQ}@&, @\placeholder{T}@*);
+@\placeholder{T}@*@\cvqual{vq}@&   operator=(@\placeholder{T}@*@\cvqual{vq}@&, @\placeholder{T}@*);
 \end{codeblock}
 
 \pnum
 For every pair
 (\tcode{\placeholder{T}},
-\tcode{\placeholder{VQ}}),
+\cvqual{vq}),
 where
 \tcode{\placeholder{T}}
-is an enumeration or pointer to member type and
-\tcode{\placeholder{VQ}}
-is either
-\tcode{volatile}
-or empty,
+is an enumeration or pointer to member type,
 there exist candidate operator functions of the form
 
 \begin{codeblock}
-@\placeholder{VQ} \placeholder{T}@&   operator=(@\placeholder{VQ} \placeholder{T}@&, @\placeholder{T}@);
+@\cvqual{vq} \placeholder{T}@&   operator=(@\cvqual{vq} \placeholder{T}@&, @\placeholder{T}@);
 \end{codeblock}
 
 \pnum
 For every pair
 (\tcode{\placeholder{T}},
-\tcode{\placeholder{VQ}}),
+\cvqual{vq}),
 where
 \tcode{\placeholder{T}}
-is a cv-qualified or cv-unqualified object type and
-\tcode{\placeholder{VQ}}
-is either
-\tcode{volatile}
-or empty,
+is a cv-qualified or cv-unqualified object type,
 there exist candidate operator functions of the form
 
 \begin{codeblock}
-@\placeholder{T}@*@\placeholder{VQ}@&   operator+=(@\placeholder{T}@*@\placeholder{VQ}@&, std::ptrdiff_t);
-@\placeholder{T}@*@\placeholder{VQ}@&   operator-=(@\placeholder{T}@*@\placeholder{VQ}@&, std::ptrdiff_t);
+@\placeholder{T}@*@\cvqual{vq}@&   operator+=(@\placeholder{T}@*@\cvqual{vq}@&, std::ptrdiff_t);
+@\placeholder{T}@*@\cvqual{vq}@&   operator-=(@\placeholder{T}@*@\cvqual{vq}@&, std::ptrdiff_t);
 \end{codeblock}
 
 \pnum
 For every triple
 (\tcode{\placeholder{L}},
-\tcode{\placeholder{VQ}},
+\cvqual{vq},
 \tcode{\placeholder{R}}),
 where
 \tcode{\placeholder{L}}
-is an integral type,
-\tcode{\placeholder{VQ}}
-is either
-\tcode{volatile}
-or empty,
-and
+is an integral type, and
 \tcode{\placeholder{R}}
 is a promoted integral type,
 there exist candidate operator functions of the form
 
 \begin{codeblock}
-@\placeholder{VQ L}@&   operator%=(@\placeholder{VQ L}@&, @\placeholder{R}@);
-@\placeholder{VQ L}@&   operator<<=(@\placeholder{VQ L}@&, @\placeholder{R}@);
-@\placeholder{VQ L}@&   operator>>=(@\placeholder{VQ L}@&, @\placeholder{R}@);
-@\placeholder{VQ L}@&   operator&=(@\placeholder{VQ L}@&, @\placeholder{R}@);
-@\placeholder{VQ L}@&   operator^=(@\placeholder{VQ L}@&, @\placeholder{R}@);
-@\placeholder{VQ L}@&   operator|=(@\placeholder{VQ L}@&, @\placeholder{R}@);
+@\cvqual{vq} \placeholder{L}@&   operator%=(@\cvqual{vq} \placeholder{L}@&, @\placeholder{R}@);
+@\cvqual{vq} \placeholder{L}@&   operator<<=(@\cvqual{vq} \placeholder{L}@&, @\placeholder{R}@);
+@\cvqual{vq} \placeholder{L}@&   operator>>=(@\cvqual{vq} \placeholder{L}@&, @\placeholder{R}@);
+@\cvqual{vq} \placeholder{L}@&   operator&=(@\cvqual{vq} \placeholder{L}@&, @\placeholder{R}@);
+@\cvqual{vq} \placeholder{L}@&   operator^=(@\cvqual{vq} \placeholder{L}@&, @\placeholder{R}@);
+@\cvqual{vq} \placeholder{L}@&   operator|=(@\cvqual{vq} \placeholder{L}@&, @\placeholder{R}@);
 \end{codeblock}
 
 \pnum