Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't define typedef-names in the library wording #6419

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0b90cfc
[expos.only.entity] Say typedef-names are declared
frederick-vs-ja Apr 24, 2024
1e1a903
[type.descriptions.general] Use "shown" for impl-def types
frederick-vs-ja Aug 2, 2023
8a03d25
[enumerated.types] Reword enumerated types
frederick-vs-ja Aug 2, 2023
eb8c59b
[bitmask.types] Reword bitmask types
frederick-vs-ja Aug 2, 2023
42b1e2a
[extern.types] Use "declared" for C library types
frederick-vs-ja Apr 24, 2024
cd35372
[cstdint.syn] Use "declare" for typedef-names
frederick-vs-ja Jul 28, 2023
ca93ce4
[stdfloat.syn] Use "declare" for typedef-names
frederick-vs-ja Jul 28, 2023
100a31f
[meta.rqmts] Use "declare" for typedef-names
frederick-vs-ja Jul 28, 2023
39831b3
[meta.trans.other] Use "declare" for typedef-names
frederick-vs-ja Jul 28, 2023
ce90af8
[ratio.si] Use "declare" for typedef-names
frederick-vs-ja Jul 28, 2023
b88485a
[readable.traits] Use "declare" for typedef-names
frederick-vs-ja Jul 28, 2023
d831efd
[iterator.traits] Use "declare" for typedef-names
frederick-vs-ja Jul 28, 2023
f2dc352
[std.iterator.tags] Use "declare" for typedef-names
frederick-vs-ja Jul 28, 2023
d83c4a8
[const.iterators.types] Avoid "defining" `iterator_category`
frederick-vs-ja Apr 23, 2024
713c464
[move.iterator] Avoid "defining" `iterator_category`
frederick-vs-ja Apr 23, 2024
906d4ff
[common.iter.types] Avoid "defining" typedef-names
frederick-vs-ja Apr 23, 2024
ca427bb
[range.filter.iterator] Avoid "defining" typedef-names
frederick-vs-ja Apr 23, 2024
7c3bee3
[range.transform.iterator] Avoid "defining" typedef-names
frederick-vs-ja Apr 23, 2024
7d32fa2
[range.join.iterator] Avoid "defining" typedef-names
frederick-vs-ja Apr 23, 2024
1204281
[range.join.with.iterator] Avoid "defining" typedef-names
frederick-vs-ja Apr 23, 2024
feb22ce
[range.concat.iterator] Avoid "defining" typedef-names
frederick-vs-ja Apr 23, 2024
8de57dc
[range.elements.iterator] Avoid "defining" typedef-names
frederick-vs-ja Apr 23, 2024
4127c7c
[range.zip.transform.iterator] Avoid "defining" `iterator_category`
frederick-vs-ja Apr 23, 2024
1a6239f
[range.stride.iterator] Avoid "defining" typedef-names
frederick-vs-ja Apr 23, 2024
cea6fda
[format.string.std] Use "declare" for typedef-names
frederick-vs-ja Oct 17, 2024
8ed6a05
[atomics.alias] Use "declare" for typedef-names
frederick-vs-ja Jul 28, 2023
6fb7a92
[stdatomic.h.syn] Use "declare" for typedef-names
frederick-vs-ja Jul 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions source/iterators.tex
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@

\pnum
\begin{note}
Some legacy output iterators define a nested type named \tcode{value_type}
Some legacy output iterators declare a nested type named \tcode{value_type}
that is an alias for \keyword{void}.
These types are not \libconcept{indirectly_readable}
and have no associated value types.
Expand All @@ -903,15 +903,15 @@
\begin{codeblock}
iterator_traits<I>::iterator_category
\end{codeblock}
be defined as the iterator's iterator category.
be declared as the iterator's iterator category.
In addition, the types
\indexlibrarymember{pointer}{iterator_traits}%
\indexlibrarymember{reference}{iterator_traits}%
\begin{codeblock}
iterator_traits<I>::pointer
iterator_traits<I>::reference
\end{codeblock}
shall be defined as the iterator's pointer and reference types;
shall be declared as the iterator's pointer and reference types;
that is, for an
iterator object \tcode{a} of class type,
the same type as
Expand All @@ -929,7 +929,7 @@
iterator_traits<I>::difference_type
iterator_traits<I>::reference
\end{codeblock}
may be defined as \keyword{void}.
may be declared as \keyword{void}.

\pnum
The definitions in this subclause make use of the following
Expand Down Expand Up @@ -1089,7 +1089,7 @@
the \oldconcept{InputIter\-ator} requirements\iref{input.iterators},
an \tcode{iterator_traits} specialization might have
\tcode{iterator_concept} denote \tcode{input_iterator_tag}
but not define \tcode{iterator_category}.
but not declare \tcode{iterator_category}.
\end{example}

\pnum
Expand Down Expand Up @@ -2757,7 +2757,7 @@
For every iterator of type
\tcode{I},
\tcode{iterator_traits<I>::it\-er\-a\-tor_ca\-te\-go\-ry}
shall be defined to be a category tag that describes the
shall be declared to be a category tag that describes the
iterator's behavior.
Additionally,
\tcode{iterator_traits<I>::it\-er\-a\-tor_con\-cept}
Expand Down Expand Up @@ -4392,7 +4392,7 @@
\end{itemize}

\pnum
The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
if and only if \tcode{Iterator} models \libconcept{forward_iterator}.
In that case,
\tcode{basic_const_iterator<Iterator>::iterator_category} denotes
Expand Down Expand Up @@ -4868,7 +4868,7 @@
\end{itemize}

\pnum
The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
if and only if the \grammarterm{qualified-id}
\tcode{iterator_traits<It\-erator>::iterator_category}
is valid and denotes a type.
Expand Down Expand Up @@ -5528,7 +5528,7 @@
\pnum
The nested \grammarterm{typedef-name} \tcode{iterator_category} of
the specialization of \tcode{iterator_traits} for \tcode{common_iterator<I, S>}
is defined if and only if \tcode{iter_difference_t<I>} is an integral type.
is declared if and only if \tcode{iter_difference_t<I>} is an integral type.
In that case,
\tcode{iterator_category} denotes \tcode{forward_iterator_tag} if
the \grammarterm{qualified-id} \tcode{iterator_traits<I>::iterator_category}
Expand Down
12 changes: 6 additions & 6 deletions source/lib-intro.tex
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,8 @@

\pnum
Several entities and \grammarterm{typedef-name}{s}
defined in \ref{\firstlibchapter} through \ref{\lastlibchapter} and \ref{depr}
are only defined for the purpose of exposition.
declared in \ref{\firstlibchapter} through \ref{\lastlibchapter} and \ref{depr}
are only declared for the purpose of exposition.
The declaration of such an entity or \grammarterm{typedef-name}
is followed by a comment ending in \expos.

Expand Down Expand Up @@ -558,14 +558,14 @@
the library.

\pnum
Certain types defined in \ref{input.output} are used to describe implementation-defined types.
Certain types shown in \ref{input.output} are used to describe implementation-defined types.
\indextext{types!implementation-defined}%
They are based on other types, but with added constraints.

\rSec4[enumerated.types]{Enumerated types}

\pnum
Several types defined in \ref{input.output} are
Several types specified in \ref{input.output} and \ref{re} are
\defnadjx{enumerated}{types}{type}.
Each enumerated type may be implemented as an enumeration or as a synonym for
an enumeration.
Expand Down Expand Up @@ -598,7 +598,7 @@
\rSec4[bitmask.types]{Bitmask types}

\pnum
Several types defined in \ref{\firstlibchapter} through \ref{\lastlibchapter}
Several types specified in \ref{\firstlibchapter} through \ref{\lastlibchapter}
and \ref{depr} are
\defnx{bitmask types}{type!bitmask}.
Each bitmask type can be implemented as an
Expand Down Expand Up @@ -3274,7 +3274,7 @@
\tcode{::T}
and
\tcode{std::T}
are reserved to the implementation and, when defined,
are reserved to the implementation and, when declared,
\tcode{::T}
shall be identical to
\tcode{std::T}.
Expand Down
16 changes: 8 additions & 8 deletions source/meta.tex
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
modifies a property
of a type. It shall be a class template that takes one
template type argument and, optionally, additional arguments that help
define the modification. It shall define a publicly accessible nested type
define the modification. It shall declare a publicly accessible nested type
named \tcode{type}, which shall be a synonym for the modified type.

\pnum
Expand Down Expand Up @@ -1949,7 +1949,7 @@
\tcode{template<class... T>} \tcode{struct common_type;}
&
Unless this trait is specialized,
the member \tcode{type} is defined or omitted as specified below.
the member \tcode{type} is declared or omitted as specified below.
If it is omitted, there shall be no member \tcode{type}.
Each type in the template parameter pack \tcode{T} shall be
complete, \cv{}~\keyword{void}, or an array of unknown bound. \\ \rowsep
Expand All @@ -1965,7 +1965,7 @@

\tcode{template<class... T>} \tcode{struct \libglobal{common_reference};}
&
The member \grammarterm{typedef-name} \tcode{type} is defined or omitted
The member \grammarterm{typedef-name} \tcode{type} is declared or omitted
as specified below. Each type in the parameter pack \tcode{T} shall
be complete or \cv{} \keyword{void}. \\ \rowsep

Expand Down Expand Up @@ -2075,7 +2075,7 @@

\pnum
For the \tcode{common_type} trait applied to a template parameter pack \tcode{T} of types,
the member \tcode{type} shall be either defined or not present as follows:
the member \tcode{type} shall be either declared or not present as follows:

\begin{itemize}
\item If \tcode{sizeof...(T)} is zero, there shall be no member \tcode{type}.
Expand Down Expand Up @@ -2148,7 +2148,7 @@

\pnum
For the \tcode{common_reference} trait applied to a parameter pack
\tcode{T} of types, the member \tcode{type} shall be either defined or not
\tcode{T} of types, the member \tcode{type} shall be either declared or not
present as follows:
\begin{itemize}
\item If \tcode{sizeof...(T)} is zero, there shall be no member \tcode{type}.
Expand Down Expand Up @@ -2218,7 +2218,7 @@

\pnum
\begin{example}
Given these definitions:
Given these declarations:
\begin{codeblock}
using PF1 = bool (&)();
using PF2 = short (*)(long);
Expand Down Expand Up @@ -2779,5 +2779,5 @@
\tcode{ronna}, and \tcode{quetta},
if both of the constants used in its
specification are representable by \tcode{intmax_t}, the typedef is
defined; if either of the constants is not representable by \tcode{intmax_t},
the typedef is not defined.
declared; if either of the constants is not representable by \tcode{intmax_t},
the typedef is not declared.
16 changes: 8 additions & 8 deletions source/ranges.tex
Original file line number Diff line number Diff line change
Expand Up @@ -4769,7 +4769,7 @@
\end{itemize}

\pnum
The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
if and only if \tcode{V} models \libconcept{forward_range}.
In that case,
\tcode{\exposid{iterator}::iterator_category} is defined as follows:
Expand Down Expand Up @@ -5291,7 +5291,7 @@
\end{itemize}

\pnum
The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
if and only if \exposid{Base} models \libconcept{forward_range}.
In that case,
\tcode{\exposid{iterator}::iterator_category} is defined as follows:
Expand Down Expand Up @@ -6666,7 +6666,7 @@
\end{itemize}

\pnum
The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
if and only if \exposid{ref-is-glvalue} is \tcode{true},
\exposid{Base} models \libconcept{forward_range}, and
\tcode{range_reference_t<\exposid{Base}>} models \libconcept{forward_range}.
Expand Down Expand Up @@ -7233,7 +7233,7 @@
\end{itemize}

\pnum
The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
if and only if \exposid{ref-is-glvalue} is \tcode{true}, and
\exposid{Base} and \exposid{InnerBase} each model \libconcept{forward_range}.
In that case,
Expand Down Expand Up @@ -8825,7 +8825,7 @@
\end{itemize}

\pnum
The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
if and only if
\tcode{\exposconcept{all-forward}<Const, Views...>} is modeled.
In that case,
Expand Down Expand Up @@ -10109,7 +10109,7 @@
\end{itemize}

\pnum
The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
if and only if \exposid{Base} models \libconcept{forward_range}.
In that case, \tcode{iterator_category} is defined as follows:
Let \tcode{C} denote the type
Expand Down Expand Up @@ -11887,7 +11887,7 @@
\pnum
The member \grammarterm{typedef-name}
\tcode{\exposid{iterator}::iterator_category}
is defined if and only if \exposid{Base} models \libconcept{forward_range}.
is declared if and only if \exposid{Base} models \libconcept{forward_range}.
In that case,
\tcode{\exposid{iterator}::iterator_category} is defined as follows:
\begin{itemize}
Expand Down Expand Up @@ -15588,7 +15588,7 @@
\end{itemize}

\pnum
The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
if and only if \exposid{Base} models \libconcept{forward_range}.
In that case,
\tcode{\exposid{iterator}::iterator_category} is defined as follows:
Expand Down
6 changes: 3 additions & 3 deletions source/support.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1979,10 +1979,10 @@
are also optional;
however, if an implementation defines integer types
with the corresponding width and no padding bits,
it defines the corresponding \grammarterm{typedef-name}s.
it declares the corresponding \grammarterm{typedef-name}s.
Each of the macros listed in this subclause
is defined if and only if
the implementation defines the corresponding \grammarterm{typedef-name}.
the implementation declares the corresponding \grammarterm{typedef-name}.
\begin{note}
The macros \tcode{INT\placeholdernc{N}_C} and \tcode{UINT\placeholdernc{N}_C}
correspond to the \grammarterm{typedef-name}s
Expand All @@ -1993,7 +1993,7 @@
\rSec2[stdfloat.syn]{Header \tcode{<stdfloat>} synopsis}

\pnum
The header \libheader{stdfloat} defines type aliases for
The header \libheader{stdfloat} declares type aliases for
the optional extended floating-point types that are specified in
\ref{basic.extended.fp}.

Expand Down
2 changes: 1 addition & 1 deletion source/text.tex
Original file line number Diff line number Diff line change
Expand Up @@ -6640,7 +6640,7 @@
\topline
\lhdr{Type} & \rhdr{Meaning} \\ \rowsep
none, \tcode{p} &
If \tcode{uintptr_t} is defined,
If \tcode{uintptr_t} is declared,
\begin{codeblock}
to_chars(first, last, reinterpret_cast<uintptr_t>(value), 16)
\end{codeblock}
Expand Down
6 changes: 3 additions & 3 deletions source/threads.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2752,10 +2752,10 @@
\pnum
The type aliases \tcode{atomic_int$N$_t}, \tcode{atomic_uint$N$_t},
\tcode{atomic_intptr_t}, and \tcode{atomic_uintptr_t}
are defined if and only if
are declared if and only if
\tcode{int$N$_t}, \tcode{uint$N$_t},
\tcode{intptr_t}, and \tcode{uintptr_t}
are defined, respectively.
are declared, respectively.

\pnum
\indexlibraryglobal{atomic_signed_lock_free}%
Expand Down Expand Up @@ -6418,7 +6418,7 @@
\pnum
Each of the \grammarterm{using-declaration}s for
\tcode{int$N$_t}, \tcode{uint$N$_t}, \tcode{intptr_t}, and \tcode{uintptr_t}
listed above is defined if and only if the implementation defines
listed above is declared if and only if the implementation declares
the corresponding \grammarterm{typedef-name} in \ref{atomics.syn}.

\pnum
Expand Down
Loading