Skip to content

Commit 337c7db

Browse files
jensmaurertkoeppe
authored andcommitted
[expr] Use 'qualification-combined' and 'qualification-decomposition'
The previous names 'cv-combined' and 'cv-decomposition' are no longer adequate since a qualification conversion can now convert to an array of unknown bounds.
1 parent d006a0d commit 337c7db

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

source/expressions.tex

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,8 @@
373373
if \tcode{T1} is ``pointer to \cvqual{cv1} \tcode{C1}'' and \tcode{T2} is ``pointer to
374374
\cvqual{cv2} \tcode{C2}'', where \tcode{C1} is reference-related to \tcode{C2} or \tcode{C2} is
375375
reference-related to \tcode{C1}\iref{dcl.init.ref},
376-
the cv-combined type\iref{conv.qual}
377-
of \tcode{T1} and \tcode{T2} or the cv-combined type of \tcode{T2} and \tcode{T1},
376+
the qualification-combined type\iref{conv.qual}
377+
of \tcode{T1} and \tcode{T2} or the qualification-combined type of \tcode{T2} and \tcode{T1},
378378
respectively;
379379

380380
\item
@@ -396,11 +396,11 @@
396396
for some non-function type \tcode{U},
397397
where \tcode{C1} is
398398
reference-related to \tcode{C2} or \tcode{C2} is reference-related to
399-
\tcode{C1}\iref{dcl.init.ref}, the cv-combined type of \tcode{T2} and \tcode{T1} or the cv-combined type
399+
\tcode{C1}\iref{dcl.init.ref}, the qualification-combined type of \tcode{T2} and \tcode{T1} or the qualification-combined type
400400
of \tcode{T1} and \tcode{T2}, respectively;
401401

402402
\item
403-
if \tcode{T1} and \tcode{T2} are similar types\iref{conv.qual}, the cv-combined type of \tcode{T1} and
403+
if \tcode{T1} and \tcode{T2} are similar types\iref{conv.qual}, the qualification-combined type of \tcode{T1} and
404404
\tcode{T2};
405405

406406
\item
@@ -724,7 +724,7 @@
724724

725725
\indextext{conversion!qualification|(}%
726726
\pnum
727-
A \defn{cv-decomposition} of a type \tcode{T}
727+
A \defn{qualification-decomposition} of a type \tcode{T}
728728
is a sequence of
729729
$\cv{}_i$ and $P_i$
730730
such that \tcode{T} is
@@ -743,29 +743,29 @@
743743
the cv-qualifiers $\cv{}_i$ of the array.
744744
\begin{example}
745745
The type denoted by the \grammarterm{type-id} \tcode{const int **}
746-
has three cv-decompositions,
746+
has three qualification-decompositions,
747747
taking \tcode{U}
748748
as ``\tcode{int}'',
749749
as ``pointer to \tcode{const int}'', and
750750
as ``pointer to pointer to \tcode{const int}''.
751751
\end{example}
752752
The $n$-tuple of cv-qualifiers after the first one
753-
in the longest cv-decomposition of \tcode{T}, that is,
753+
in the longest qualification-decomposition of \tcode{T}, that is,
754754
$\cv{}_1, \cv{}_2, \dotsc, \cv{}_n$, is called the
755755
\defn{cv-qualification signature} of \tcode{T}.
756756

757757
\pnum
758758
\indextext{type!similar|see{similar types}}%
759759
Two types \tcode{T1} and \tcode{T2} are \defnx{similar}{similar types} if
760-
they have cv-decompositions with the same $n$
760+
they have qualification-decompositions with the same $n$
761761
such that corresponding $P_i$ components are either the same
762762
or one is ``array of $N_i$'' and the other is ``array of unknown bound of'',
763763
and the types denoted by \tcode{U} are the same.
764764

765765
\pnum
766-
The \defnadj{cv-combined}{type} of two types \tcode{T1} and \tcode{T2}
766+
The \defnadj{qualification-combined}{type} of two types \tcode{T1} and \tcode{T2}
767767
is the type \tcode{T3}
768-
similar to \tcode{T1} whose cv-decomposition is such that:
768+
similar to \tcode{T1} whose qualification-decomposition is such that:
769769
\begin{itemize}
770770
\item
771771
for every $i > 0$, $\cv{}^3_i$ is the union of
@@ -779,10 +779,10 @@
779779
then \tcode{const} is added to every $\cv{}^3_k$ for $0 < k < i$,
780780
\end{itemize}
781781
where $\cv{}^j_i$ and $P^j_i$ are the components of
782-
the cv-decomposition of $\tcode{T}j$.
782+
the qualification-decomposition of $\tcode{T}j$.
783783
A prvalue of type \tcode{T1}
784784
can be converted to type \tcode{T2}
785-
if the cv-combined type of \tcode{T1} and \tcode{T2} is \tcode{T2}.
785+
if the qualification-combined type of \tcode{T1} and \tcode{T2} is \tcode{T2}.
786786
\begin{note}
787787
If a program could assign a pointer of type \tcode{T**} to a pointer of
788788
type \tcode{const} \tcode{T**} (that is, if line \#1 below were
@@ -801,7 +801,7 @@
801801
\begin{note}
802802
Given similar types \tcode{T1} and \tcode{T2}, this
803803
construction ensures that
804-
both can be converted to the cv-combined type of \tcode{T1} and \tcode{T2}.
804+
both can be converted to the qualification-combined type of \tcode{T1} and \tcode{T2}.
805805
\end{note}
806806

807807
\pnum
@@ -4144,7 +4144,7 @@
41444144
For two similar types \tcode{T1} and \tcode{T2}\iref{conv.qual},
41454145
a prvalue of type \tcode{T1} may be explicitly
41464146
converted to the type \tcode{T2} using a \tcode{const_cast}
4147-
if, considering the cv-decompositions of both types,
4147+
if, considering the qualification-decompositions of both types,
41484148
each $P^1_i$ is the same as $P^2_i$ for all $i$.
41494149
The result of a \tcode{const_cast} refers to the original entity.
41504150
\begin{example}
@@ -4203,9 +4203,9 @@
42034203
A conversion from a type \tcode{T1} to a type \tcode{T2}
42044204
\defnx{casts away constness}{casting away constness}
42054205
if \tcode{T1} and \tcode{T2} are different,
4206-
there is a cv-decomposition\iref{conv.qual} of \tcode{T1}
4206+
there is a qualification-decomposition\iref{conv.qual} of \tcode{T1}
42074207
yielding \placeholder{n} such that
4208-
\tcode{T2} has a cv-decomposition of the form
4208+
\tcode{T2} has a qualification-decomposition of the form
42094209
\begin{indented}
42104210
$\cv{}_0^2$ $P_0^2$ $\cv{}_1^2$ $P_1^2$ $\cdots$ $\cv{}_{n-1}^2$ $P_{n-1}^2$ $\cv{}_n^2$ $\mathtt{U}_2$,
42114211
\end{indented}

0 commit comments

Comments
 (0)