From 6f8dbb50edd3b781c5cd406bda22f9627875b360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Benetkiewicz?= Date: Tue, 17 Dec 2024 16:24:31 +0100 Subject: [PATCH] [basic.scope.scope] Rename to [basic.scope.general]. --- source/basic.tex | 10 +++++----- source/classes.tex | 4 ++-- source/declarations.tex | 8 ++++---- source/overloading.tex | 2 +- source/templates.tex | 8 ++++---- source/xrefdelta.tex | 3 +++ source/xrefprev | 2 +- 7 files changed, 20 insertions(+), 17 deletions(-) diff --git a/source/basic.tex b/source/basic.tex index ea4ba883ce..eb34c497e7 100644 --- a/source/basic.tex +++ b/source/basic.tex @@ -532,14 +532,14 @@ \pnum A local entity\iref{basic.pre} -is \defn{odr-usable} in a scope\iref{basic.scope.scope} if +is \defn{odr-usable} in a scope\iref{basic.scope.general} if \begin{itemize} \item either the local entity is not \tcode{*\keyword{this}}, or an enclosing class or non-lambda function parameter scope exists and, if the innermost such scope is a function parameter scope, it corresponds to a non-static member function, and \item -for each intervening scope\iref{basic.scope.scope} +for each intervening scope\iref{basic.scope.general} between the point at which the entity is introduced and the scope (where \tcode{*\keyword{this}} is considered to be introduced within the innermost enclosing class or non-lambda function definition scope), @@ -873,7 +873,7 @@ \rSec1[basic.scope]{Scope}% \indextext{scope|(} -\rSec2[basic.scope.scope]{General} +\rSec2[basic.scope.general]{General} \pnum The declarations in a program appear in a number of \defnx{scopes}{scope} @@ -1725,7 +1725,7 @@ conversion function templates that are members of $T$ are considered. For each such template $F$, the lookup set $S(t,T)$ is constructed, considering a function template declaration to have the name $t$ -only if it corresponds to a declaration of $F$\iref{basic.scope.scope}. +only if it corresponds to a declaration of $F$\iref{basic.scope.general}. The members of the declaration set of each such lookup set, which shall not be an invalid set, are included in the result. \begin{note} @@ -2846,7 +2846,7 @@ Two declarations of entities declare the same entity if, considering declarations of unnamed types to introduce their names for linkage purposes, if any\iref{dcl.typedef,dcl.enum}, -they correspond\iref{basic.scope.scope}, +they correspond\iref{basic.scope.general}, have the same target scope that is not a function or template parameter scope, neither is a name-independent declaration, and either diff --git a/source/classes.tex b/source/classes.tex index ee72c85dd9..34bbb0130d 100644 --- a/source/classes.tex +++ b/source/classes.tex @@ -601,7 +601,7 @@ \end{itemize} \begin{note} A single name can denote several member functions provided their types -are sufficiently different\iref{basic.scope.scope}. +are sufficiently different\iref{basic.scope.general}. \end{note} \pnum @@ -3686,7 +3686,7 @@ If a virtual member function $F$ is declared in a class $B$, and, in a class $D$ derived (directly or indirectly) from $B$, a declaration of a member function $G$ -corresponds\iref{basic.scope.scope} to a declaration of $F$, +corresponds\iref{basic.scope.general} to a declaration of $F$, ignoring trailing \grammarterm{requires-clause}s, \indextext{override|see{function, virtual, override}}% then $G$ \defnx{overrides}{function!virtual!override} diff --git a/source/declarations.tex b/source/declarations.tex index 7cbe7fb501..a8b9a2c8a3 100644 --- a/source/declarations.tex +++ b/source/declarations.tex @@ -126,7 +126,7 @@ \pnum \indextext{declaration}% \indextext{scope}% -Certain declarations contain one or more scopes\iref{basic.scope.scope}. +Certain declarations contain one or more scopes\iref{basic.scope.general}. Unless otherwise stated, utterances in \ref{dcl.dcl} about components in, of, or contained by a declaration or subcomponent thereof refer only to those components of @@ -2703,7 +2703,7 @@ all function declarations are discarded; \item otherwise, -if the \grammarterm{declarator} corresponds\iref{basic.scope.scope} to +if the \grammarterm{declarator} corresponds\iref{basic.scope.general} to any declaration found of a non-template function, all function template declarations are discarded; \item @@ -7405,7 +7405,7 @@ shall not inhabit a class scope and shall correspond to one or more declarations nominable in the class, class template, or namespace -to which the \grammarterm{nested-name-specifier} refers\iref{basic.scope.scope}. +to which the \grammarterm{nested-name-specifier} refers\iref{basic.scope.general}. All those declarations shall have the same target scope; the target scope of $D$ is that scope. @@ -8337,7 +8337,7 @@ \pnum If a declaration named by a \grammarterm{using-declaration} that inhabits the target scope of another declaration $B$ -potentially conflicts with it\iref{basic.scope.scope}, and +potentially conflicts with it\iref{basic.scope.general}, and either is reachable from the other, the program is ill-formed unless $B$ is name-independent and the \grammarterm{using-declaration} precedes $B$. diff --git a/source/overloading.tex b/source/overloading.tex index cf7d80931c..95584f87ec 100644 --- a/source/overloading.tex +++ b/source/overloading.tex @@ -795,7 +795,7 @@ unless a search for the name \tcode{\keyword{operator}!=} in the scope $S$ from the instantiation context of the operator expression finds a function or function template -that would correspond\iref{basic.scope.scope} to \tcode{F} +that would correspond\iref{basic.scope.general} to \tcode{F} if its name were \tcode{\keyword{operator}==}, where $S$ is the scope of the class type of \tcode{o} if \tcode{F} is a class member, and diff --git a/source/templates.tex b/source/templates.tex index d616394cc3..f49bd14f49 100644 --- a/source/templates.tex +++ b/source/templates.tex @@ -142,7 +142,7 @@ \pnum \begin{note} A template cannot have the same name as any other -name bound in the same scope\iref{basic.scope.scope}, except +name bound in the same scope\iref{basic.scope.general}, except that a function template can share a name with \grammarterm{using-declarator}s, a type, non-template functions\iref{dcl.fct} and/or function templates\iref{temp.over}. Specializations, including partial specializations\iref{temp.spec.partial}, @@ -3980,7 +3980,7 @@ \item introduce the same name, \item -have corresponding signatures\iref{basic.scope.scope}, +have corresponding signatures\iref{basic.scope.general}, \item would declare the same entity, when considering $A$ and $B$ to correspond in that determination\iref{basic.link}, and @@ -6503,7 +6503,7 @@ \end{example} \pnum -An explicit instantiation does not introduce a name\iref{basic.scope.scope}. +An explicit instantiation does not introduce a name\iref{basic.scope.general}. A declaration of a function template, a variable template, a member function or static data member of a class template, or a member function template of a class or class @@ -6701,7 +6701,7 @@ may be defined\iref{dcl.meaning,class.mem,temp.mem}. \pnum -An explicit specialization does not introduce a name\iref{basic.scope.scope}. +An explicit specialization does not introduce a name\iref{basic.scope.general}. A declaration of a function template, class template, or variable template being explicitly specialized shall be reachable from the declaration of the explicit specialization. diff --git a/source/xrefdelta.tex b/source/xrefdelta.tex index 6484384dc1..7c4f1e13aa 100644 --- a/source/xrefdelta.tex +++ b/source/xrefdelta.tex @@ -101,6 +101,9 @@ % https://github.com/cplusplus/draft/pull/7345 \movedxref{basic.stc.inherit}{basic.stc.general} +% https://github.com/cplusplus/draft/pull/7496 +\movedxref{basic.scope.scope}{basic.scope.general} + %%% Deprecated features. %%% Example: % diff --git a/source/xrefprev b/source/xrefprev index 72e4f16ee5..890c5bcfc4 100644 --- a/source/xrefprev +++ b/source/xrefprev @@ -98,7 +98,7 @@ \glossaryentry{basic.def@ {\memgloterm{basic.def}}{\memglodesc{(\ref {basic.def})}} {\memgloref{}}|memjustarg}{33} \glossaryentry{basic.def.odr@ {\memgloterm{basic.def.odr}}{\memglodesc{(\ref {basic.def.odr})}} {\memgloref{}}|memjustarg}{34} \glossaryentry{basic.scope@ {\memgloterm{basic.scope}}{\memglodesc{(\ref {basic.scope})}} {\memgloref{}}|memjustarg}{39} -\glossaryentry{basic.scope.scope@ {\memgloterm{basic.scope.scope}}{\memglodesc{(\ref {basic.scope.scope})}} {\memgloref{}}|memjustarg}{39} +\glossaryentry{basic.scope.general@ {\memgloterm{basic.scope.general}}{\memglodesc{(\ref {basic.scope.general})}} {\memgloref{}}|memjustarg}{39} \glossaryentry{basic.scope.pdecl@ {\memgloterm{basic.scope.pdecl}}{\memglodesc{(\ref {basic.scope.pdecl})}} {\memgloref{}}|memjustarg}{41} \glossaryentry{basic.scope.block@ {\memgloterm{basic.scope.block}}{\memglodesc{(\ref {basic.scope.block})}} {\memgloref{}}|memjustarg}{42} \glossaryentry{basic.scope.param@ {\memgloterm{basic.scope.param}}{\memglodesc{(\ref {basic.scope.param})}} {\memgloref{}}|memjustarg}{43}