[stmt, dcl] Rename labels

Author: jensmaurer

source/basic.tex

@@ -137,7 +137,7 @@
 \indextext{declaration!definition versus}%
 \indextext{declaration}%
 \indextext{declaration!name}%
-A declaration\iref{dcl.dcl} may (re)introduce
+A declaration\iref{dcl} may (re)introduce
 one or more names and/or entities into a translation
 unit.
 If so, the

source/compatibility.tex

@@ -72,7 +72,7 @@
 \end{codeblock}
 \end{example}
 
-\rSec2[diff.cpp23.dcl.dcl]{\ref{dcl.dcl}: declarations}
+\rSec2[diff.cpp23.dcl.dcl]{\ref{dcl}: declarations}
 
 \diffref{dcl.init.list}
 \change
@@ -413,7 +413,7 @@
 \end{codeblock}
 \end{example}
 
-\rSec2[diff.cpp20.stmt]{\ref{stmt.stmt}: statements}
+\rSec2[diff.cpp20.stmt]{\ref{stmt}: statements}
 
 \diffref{stmt.ranged}
 \change
@@ -437,7 +437,7 @@
 \end{codeblock}
 \end{example}
 
-\rSec2[diff.cpp20.dcl]{\ref{dcl.dcl}: declarations}
+\rSec2[diff.cpp20.dcl]{\ref{dcl}: declarations}
 
 \diffref{dcl.init.string}
 \change
@@ -904,7 +904,7 @@
 if those entities are only referenced in contexts
 that do not result in an odr-use.
 
-\rSec2[diff.cpp17.dcl.dcl]{\ref{dcl.dcl}: declarations}
+\rSec2[diff.cpp17.dcl.dcl]{\ref{dcl}: declarations}
 
 \diffref{dcl.typedef}
 \change
@@ -1544,7 +1544,7 @@
 \tcode{::operator new(std::size_t, std::align_val_t)}
 is used instead.
 
-\rSec2[diff.cpp14.dcl.dcl]{\ref{dcl.dcl}: declarations}
+\rSec2[diff.cpp14.dcl.dcl]{\ref{dcl}: declarations}
 
 \diffref{dcl.stc}
 \indextext{\idxcode{register} storage class}%
@@ -1930,7 +1930,7 @@
 revision of \Cpp{}, it yields \tcode{sizeof(const char[1])}.
 \end{example}
 
-\rSec2[diff.cpp11.dcl.dcl]{\ref{dcl.dcl}: declarations}
+\rSec2[diff.cpp11.dcl.dcl]{\ref{dcl}: declarations}
 
 \diffref{dcl.constexpr}
 \change
@@ -2172,7 +2172,7 @@
 \end{codeblock}
 \end{example}
 
-\rSec2[diff.cpp03.dcl.dcl]{\ref{dcl.dcl}: declarations}
+\rSec2[diff.cpp03.dcl.dcl]{\ref{dcl}: declarations}
 
 \diffref{dcl.spec}
 \change
@@ -3002,7 +3002,7 @@
 \howwide
 Rare.
 
-\rSec2[diff.stat]{\ref{stmt.stmt}: statements}
+\rSec2[diff.stat]{\ref{stmt}: statements}
 
 \diffref{stmt.switch,stmt.goto}
 \change
@@ -3050,7 +3050,7 @@
 For several years, many existing C implementations have produced warnings in
 this case.
 
-\rSec2[diff.dcl]{\ref{dcl.dcl}: declarations}
+\rSec2[diff.dcl]{\ref{dcl}: declarations}
 
 \diffref{dcl.stc}
 \change

source/declarations.tex

@@ -1,5 +1,5 @@
 %!TEX root = std.tex
-\rSec0[dcl.dcl]{Declarations}%
+\rSec0[dcl]{Declarations}%
 \indextext{declaration|(}
 
 \gramSec[gram.dcl]{Declarations}
@@ -128,7 +128,7 @@
 \indextext{scope}%
 Certain declarations contain one or more scopes\iref{basic.scope.scope}.
 Unless otherwise stated, utterances in
-\ref{dcl.dcl} about components in, of, or contained by a
+\ref{dcl} about components in, of, or contained by a
 declaration or subcomponent thereof refer only to those components of
 the declaration that are \emph{not} nested within scopes nested within
 the declaration.
@@ -8923,7 +8923,7 @@
 \pnum
 Each \grammarterm{attribute-specifier-seq} is said to \defn{appertain} to some entity or
 statement, identified by the syntactic context
-where it appears\iref{stmt.stmt,dcl.dcl,dcl.decl}.
+where it appears\iref{stmt,dcl,dcl.decl}.
 If an \grammarterm{attribute-specifier-seq} that appertains to some
 entity or statement contains an \grammarterm{attribute} or \grammarterm{alignment-specifier} that
 is not allowed to apply to that

source/expressions.tex

@@ -1499,7 +1499,7 @@
 \indextext{identifier}%
 An \grammarterm{identifier} is only
 an \grammarterm{id-expression} if it has
-been suitably declared\iref{dcl.dcl}
+been suitably declared\iref{dcl}
 or if it appears as part of a \grammarterm{declarator-id}\iref{dcl.decl}.
 An \grammarterm{identifier} that names a coroutine parameter
 refers to the copy of the parameter\iref{dcl.fct.def.coroutine}.
@@ -7921,7 +7921,7 @@
 \item
 a \keyword{goto} statement\iref{stmt.goto}.
 \begin{note}
-A \keyword{goto} statement introduced by equivalence\iref{stmt.stmt}
+A \keyword{goto} statement introduced by equivalence\iref{stmt}
 is not in scope.
 For example, a \keyword{while} statement\iref{stmt.while}
 can be executed during constant evaluation.

source/statements.tex

@@ -1,5 +1,5 @@
 %!TEX root = std.tex
-\rSec0[stmt.stmt]{Statements}%
+\rSec0[stmt]{Statements}%
 \indextext{statement|(}
 
 \gramSec[gram.stmt]{Statements}
@@ -92,7 +92,7 @@
 the \grammarterm{condition} is a structured binding declaration\iref{dcl.pre}.
 A \grammarterm{condition} that is
 neither an \grammarterm{expression} nor a structured binding declaration
-is a declaration\iref{dcl.dcl}.
+is a declaration\iref{dcl}.
 The \grammarterm{declarator} shall not
 specify a function or an array. The \grammarterm{decl-specifier-seq} shall not
 define a class or enumeration. If the \keyword{auto} \grammarterm{type-specifier} appears in

source/xrefdelta.tex

@@ -105,6 +105,10 @@
 \movedxref{expr.ass}{expr.assign}
 \movedxref{over.ass}{over.assign}
 
+% CWG 2024-11-20 in Wroclaw; https://github.com/cplusplus/draft/pull/7485
+\movedxref{stmt.stmt}{stmt}
+\movedxref{dcl.dcl}{dcl}
+
 %%% Deprecated features.
 %%% Example:
 %