Skip to content

Commit 813e8e9

Browse files
jensmaurerzygoloid
authored andcommitted
[expr,class,temp] Remove vestigious references
to pseudo-destructor-name and the removed section [expr.pseudo]. Add xrefdelta entry for removed section.
1 parent d444b01 commit 813e8e9

File tree

7 files changed

+14
-19
lines changed

7 files changed

+14
-19
lines changed

source/basic.tex

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,19 +1776,13 @@
17761776
of that enumeration.
17771777

17781778
\pnum
1779-
If a \grammarterm{pseudo-destructor-name}\iref{expr.pseudo} contains a
1780-
\grammarterm{nested-name-specifier}, the \grammarterm{type-name}{s} are looked
1781-
up as types in the scope designated by the
1782-
\grammarterm{nested-name-specifier}. Similarly, in a
1783-
\grammarterm{qualified-id} of the form:
1779+
In a \grammarterm{qualified-id} of the form:
17841780

17851781
\begin{ncbnf}
1786-
\opt{nested-name-specifier} class-name \terminal{::} \terminal{\~} class-name
1782+
\opt{nested-name-specifier} type-name \terminal{::} \terminal{\~} type-name
17871783
\end{ncbnf}
1788-
1789-
the second \grammarterm{class-name} is looked up in the same scope as the
1790-
first. \begin{example}
1791-
1784+
the second \grammarterm{type-name} is looked up in the same scope as the first.
1785+
\begin{example}
17921786
\begin{codeblock}
17931787
struct C {
17941788
typedef int I;
@@ -1808,8 +1802,10 @@
18081802
p->AB::~AB(); // explicitly calls the destructor for \tcode{A}
18091803
}
18101804
\end{codeblock}
1811-
\end{example} \begin{note} \ref{basic.lookup.classref} describes how name
1812-
lookup proceeds after the \tcode{.} and \tcode{->} operators. \end{note}
1805+
\end{example}
1806+
\begin{note} \ref{basic.lookup.classref} describes how name
1807+
lookup proceeds after the \tcode{.} and \tcode{->} operators.
1808+
\end{note}
18131809

18141810
\rSec3[class.qual]{Class members}
18151811

source/classes.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2384,7 +2384,7 @@
23842384
\begin{note}
23852385
\indextext{fundamental type!destructor and}%
23862386
The notation for explicit call of a destructor can be used for any scalar type
2387-
name\iref{expr.pseudo}.
2387+
name\iref{expr.prim.id.dtor}.
23882388
Allowing this makes it possible to write code without having to know if a
23892389
destructor exists for a given type.
23902390
For example:

source/expressions.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6633,7 +6633,7 @@
66336633
a \tcode{reinterpret_cast}\iref{expr.reinterpret.cast};
66346634

66356635
\item
6636-
a pseudo-destructor call\iref{expr.pseudo};
6636+
a pseudo-destructor call\iref{expr.prim.id.dtor};
66376637

66386638
\item
66396639
modification of an object~(\ref{expr.ass}, \ref{expr.post.incr},

source/iterators.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
if all operations provided to meet iterator category requirements
231231
are constexpr functions, except for
232232
\begin{itemize}
233-
\item a pseudo-destructor call\iref{expr.pseudo}, and
233+
\item a pseudo-destructor call\iref{expr.prim.id.dtor}, and
234234
\item the construction of an iterator with a singular value.
235235
\end{itemize}
236236
\begin{note}

source/overloading.tex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3410,8 +3410,7 @@
34103410
uses \tcode{->}.
34113411

34123412
\begin{ncsimplebnf}
3413-
postfix-expression \terminal{->} \terminal{\opt{template}} id-expression\\
3414-
postfix-expression \terminal{->} pseudo-destructor-name
3413+
postfix-expression \terminal{->} \terminal{\opt{template}} id-expression
34153414
\end{ncsimplebnf}
34163415

34173416
An expression

source/templates.tex

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5214,8 +5214,6 @@
52145214

52155215
\begin{ncsimplebnf}
52165216
literal\br
5217-
postfix-expression \terminal{.} pseudo-destructor-name\br
5218-
postfix-expression \terminal{->} pseudo-destructor-name\br
52195217
\terminal{sizeof} unary-expression\br
52205218
\terminal{sizeof (} type-id \terminal{)}\br
52215219
\terminal{sizeof} \terminal{...} \terminal{(} identifier \terminal{)}\br

source/xrefdelta.tex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
% P0588 replaced function prototype scope with function parameter scope.
3131
\movedxref{basic.scope.proto}{basic.scope.param}
3232

33+
\movedxref{expr.pseudo}{expr.prim.id.dtor}
34+
3335
\movedxref{utility.from.chars}{charconv.from.chars}
3436
\movedxref{utility.to.chars}{charconv.to.chars}
3537

0 commit comments

Comments
 (0)