Skip to content

Commit 27d7912

Browse files
jensmaurerzygoloid
authored andcommitted
[std] Review cross-references to [expr.prim]
Cross-references to [expr.prim] should instead point to one of its subclauses.
1 parent a7fc1b6 commit 27d7912

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

source/basic.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@
952952

953953
\pnum
954954
A namespace member can also be referred to after the \tcode{::} scope
955-
resolution operator\iref{expr.prim} applied to the name of its
955+
resolution operator\iref{expr.prim.id.qual} applied to the name of its
956956
namespace or the name of a namespace which nominates the member's
957957
namespace in a \grammarterm{using-directive}; see~\ref{namespace.qual}.
958958

@@ -1038,7 +1038,7 @@
10381038
of its class\iref{expr.ref} or a class derived from its class,
10391039
\item after the \tcode{->} operator applied to a pointer to an object of
10401040
its class\iref{expr.ref} or a class derived from its class,
1041-
\item after the \tcode{::} scope resolution operator\iref{expr.prim}
1041+
\item after the \tcode{::} scope resolution operator\iref{expr.prim.id.qual}
10421042
applied to the name of its class or a class derived from its class.
10431043
\end{itemize}
10441044

@@ -1699,7 +1699,7 @@
16991699
\indextext{qualification!explicit}%
17001700
The name of a class or namespace member
17011701
or enumerator can be referred to after the
1702-
\tcode{::} scope resolution operator\iref{expr.prim} applied to a
1702+
\tcode{::} scope resolution operator\iref{expr.prim.id.qual} applied to a
17031703
\grammarterm{nested-name-specifier} that denotes its class,
17041704
namespace, or enumeration.
17051705
If a
@@ -1752,7 +1752,7 @@
17521752
\pnum
17531753
\indextext{operator!scope resolution}%
17541754
\indextext{scope resolution operator|see{operator, scope resolution}}%
1755-
A name prefixed by the unary scope operator \tcode{::}\iref{expr.prim}
1755+
A name prefixed by the unary scope operator \tcode{::}\iref{expr.prim.id.qual}
17561756
is looked up in global scope, in the translation unit where it is used.
17571757
The name shall be declared in global namespace scope or shall be a name
17581758
whose declaration is visible in global scope because of a

source/classes.tex

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@
660660

661661
\pnum
662662
\begin{note}
663-
See~\ref{expr.prim} for restrictions on the use of non-static data
663+
See~\ref{expr.prim.id} for restrictions on the use of non-static data
664664
members and non-static member functions.
665665
\end{note}
666666

@@ -941,7 +941,7 @@
941941
\tcode{X}, the behavior is undefined.
942942

943943
\pnum
944-
When an \grammarterm{id-expression}\iref{expr.prim} that is not part of a
944+
When an \grammarterm{id-expression}\iref{expr.prim.id} that is not part of a
945945
class member access syntax\iref{expr.ref} and not used to form a
946946
pointer to member\iref{expr.unary.op} is used in
947947
a member of class \tcode{X} in a context where \tcode{this} can be
@@ -961,11 +961,11 @@
961961
member access expression is ill-formed.
962962
\end{note}
963963
Similarly during name lookup, when an
964-
\grammarterm{unqualified-id}\iref{expr.prim} used in the definition of a
964+
\grammarterm{unqualified-id}\iref{expr.prim.id.unqual} used in the definition of a
965965
member function for class \tcode{X} resolves to a static member,
966966
an enumerator or a nested type of class \tcode{X} or of a base class of
967967
\tcode{X}, the \grammarterm{unqualified-id} is transformed into a
968-
\grammarterm{qualified-id}\iref{expr.prim} in which the
968+
\grammarterm{qualified-id}\iref{expr.prim.id.qual} in which the
969969
\grammarterm{nested-name-specifier} names the class of the member function.
970970
These transformations do not apply in the
971971
template definition context\iref{temp.dep.type}.
@@ -1162,7 +1162,7 @@
11621162
\end{example}
11631163

11641164
\pnum
1165-
If an \grammarterm{unqualified-id}\iref{expr.prim} is used in the
1165+
If an \grammarterm{unqualified-id}\iref{expr.prim.id.unqual} is used in the
11661166
definition of a static member following the member's
11671167
\grammarterm{declarator-id}, and name lookup\iref{basic.lookup.unqual}
11681168
finds that the \grammarterm{unqualified-id} refers to a static
@@ -1172,7 +1172,7 @@
11721172
\grammarterm{nested-name-specifier} names the class scope from which the
11731173
member is referenced.
11741174
\begin{note}
1175-
See~\ref{expr.prim} for restrictions on the use of non-static data
1175+
See~\ref{expr.prim.id} for restrictions on the use of non-static data
11761176
members and non-static member functions.
11771177
\end{note}
11781178

@@ -1412,7 +1412,7 @@
14121412
\indextext{nested class!scope of}%
14131413
The nested class is in the scope of its enclosing class.
14141414
\begin{note}
1415-
See~\ref{expr.prim} for restrictions on the use of non-static data
1415+
See~\ref{expr.prim.id} for restrictions on the use of non-static data
14161416
members and non-static member functions.
14171417
\end{note}
14181418

source/derived.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
unless their names are hidden or ambiguous\iref{class.member.lookup}.
8989
\indextext{operator!scope resolution}%
9090
\begin{note}
91-
The scope resolution operator \tcode{::}\iref{expr.prim} can be used
91+
The scope resolution operator \tcode{::}\iref{expr.prim.id.qual} can be used
9292
to refer to a direct or indirect base member explicitly. This allows
9393
access to a name that has been redeclared in the derived class. A
9494
derived class can itself serve as a base class subject to access
@@ -885,7 +885,7 @@
885885
\pnum
886886
\indextext{operator!scope resolution}%
887887
\indextext{virtual function call}%
888-
Explicit qualification with the scope operator\iref{expr.prim}
888+
Explicit qualification with the scope operator\iref{expr.prim.id.qual}
889889
suppresses the virtual call mechanism.
890890
\begin{example}
891891
\begin{codeblock}
@@ -935,7 +935,7 @@
935935
\indextext{definition!pure virtual function}%
936936
A pure virtual function need be defined only if called with, or as if
937937
with\iref{class.dtor}, the \grammarterm{qualified-id}
938-
syntax\iref{expr.prim}.
938+
syntax\iref{expr.prim.id.qual}.
939939
\begin{example}
940940
\begin{codeblock}
941941
class point { @\commentellip@ };

source/expressions.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@
377377
An unevaluated operand is not evaluated.
378378
\begin{note}
379379
In an unevaluated operand, a non-static class member may be
380-
named\iref{expr.prim} and naming of objects or functions does not, by
380+
named\iref{expr.prim.id} and naming of objects or functions does not, by
381381
itself, require that a definition be provided\iref{basic.def.odr}.
382382
An unevaluated operand is considered a full-expression\iref{intro.execution}.
383383
\end{note}
@@ -2580,7 +2580,7 @@
25802580
non-static member function. The expression can be used only as the
25812581
left-hand operand of a member function call\iref{class.mfct}.
25822582
\begin{note} Any redundant set of parentheses surrounding the expression
2583-
is ignored\iref{expr.prim}. \end{note} The type of \tcode{E1.E2} is
2583+
is ignored\iref{expr.prim.paren}. \end{note} The type of \tcode{E1.E2} is
25842584
``function of parameter-type-list \cv{} returning \tcode{T}''.
25852585
\end{itemize}
25862586

source/overloading.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2912,7 +2912,7 @@
29122912
other than those listed.
29132913
\begin{note}
29142914
Any redundant set of parentheses surrounding the overloaded function name is
2915-
ignored\iref{expr.prim}.
2915+
ignored\iref{expr.prim.paren}.
29162916
\end{note}
29172917

29182918
\pnum

source/special.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@
12511251
\end{example}
12521252
\begin{note}
12531253
An explicit destructor call must always be written using
1254-
a member access operator\iref{expr.ref} or a \grammarterm{qualified-id}\iref{expr.prim};
1254+
a member access operator\iref{expr.ref} or a \grammarterm{qualified-id}\iref{expr.prim.id.qual};
12551255
in particular, the
12561256
\grammarterm{unary-expression}
12571257
\tcode{\~{}X()}

0 commit comments

Comments
 (0)