Skip to content

Commit

Permalink
Don't define typedef-names in the library wording
Browse files Browse the repository at this point in the history
  • Loading branch information
frederick-vs-ja committed Jul 26, 2023
1 parent dd32b7e commit 10e34ad
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 55 deletions.
22 changes: 11 additions & 11 deletions source/iterators.tex
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,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 @@ -896,15 +896,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 @@ -922,7 +922,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 @@ -1082,7 +1082,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 @@ -2756,7 +2756,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 @@ -4359,7 +4359,7 @@
\rSec3[const.iterators.types]{Member types}

\pnum
\tcode{basic_const_iterator<Iterator>::iterator_concept} is defined as follows:
\tcode{basic_const_iterator<Iterator>::iterator_concept} is determined as follows:
\begin{itemize}
\item
If \tcode{Iterator} models \libconcept{contiguous_iterator},
Expand All @@ -4378,7 +4378,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 @@ -4812,7 +4812,7 @@
\end{codeblock}

\pnum
The member \grammarterm{typedef-name} \tcode{iterator_concept} is defined
The member \grammarterm{typedef-name} \tcode{iterator_concept} is determined
as follows:
\begin{itemize}
\item
Expand All @@ -4829,7 +4829,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 @@ -5488,7 +5488,7 @@

\pnum
The nested \grammarterm{typedef-name}s of the specialization of
\tcode{iterator_traits} for \tcode{common_iterator<I, S>} are defined as follows.
\tcode{iterator_traits} for \tcode{common_iterator<I, S>} are determined as follows.
\begin{itemize}
\item
\tcode{iterator_concept} denotes \tcode{forward_iterator_tag}
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 @@ -1904,7 +1904,7 @@
\tcode{template<class... T>} \tcode{struct common_type;}
&
Unless this trait is specialized (as specified in Note B, below),
the member \tcode{type} is defined or omitted as specified in Note A, below.
the member \tcode{type} is declared or omitted as specified in Note A, 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 @@ -1922,7 +1922,7 @@
\indexlibraryglobal{common_reference}%
\tcode{template<class... T>} \tcode{struct 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 in Note C, below. Each type in the parameter pack \tcode{T} shall
be complete or \cv{} \keyword{void}. \\ \rowsep

Expand Down Expand Up @@ -2037,7 +2037,7 @@
\pnum
Note A:
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 @@ -2110,7 +2110,7 @@

\pnum
Note C: 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 @@ -2180,7 +2180,7 @@

\pnum
\begin{example}
Given these definitions:
Given these declarations and definitions:
\begin{codeblock}
using PF1 = bool (&)();
using PF2 = short (*)(long);
Expand Down Expand Up @@ -2741,5 +2741,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.
58 changes: 29 additions & 29 deletions source/ranges.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2993,7 +2993,7 @@
\end{codeblock}

\pnum
\tcode{\exposid{iterator}::iterator_concept} is defined as follows:
\tcode{\exposid{iterator}::iterator_concept} is determined as follows:
\begin{itemize}
\item If \tcode{W} models \exposconcept{advanceable}, then
\tcode{iterator_concept} is \tcode{random_access_iterator_tag}.
Expand Down Expand Up @@ -4707,7 +4707,7 @@
satisfy the filter predicate.

\pnum
\tcode{\exposid{iterator}::iterator_concept} is defined as follows:
\tcode{\exposid{iterator}::iterator_concept} is determined as follows:
\begin{itemize}
\item If \tcode{V} models \libconcept{bidirectional_range}, then
\tcode{iterator_concept} denotes \tcode{bidirectional_iterator_tag}.
Expand All @@ -4719,10 +4719,10 @@
\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:
\tcode{\exposid{iterator}::iterator_category} is determined as follows:
\begin{itemize}
\item Let \tcode{C} denote the type
\tcode{iterator_traits<iterator_t<V>>::iterator_category}.
Expand Down Expand Up @@ -5226,7 +5226,7 @@
\end{codeblock}

\pnum
\tcode{\exposid{iterator}::iterator_concept} is defined as follows:
\tcode{\exposid{iterator}::iterator_concept} is determined as follows:
\begin{itemize}
\item If \exposid{Base} models \libconcept{random_access_range}, then
\tcode{iterator_concept} denotes \tcode{random_access_iterator_tag}.
Expand All @@ -5241,10 +5241,10 @@
\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:
\tcode{\exposid{iterator}::iterator_category} is determined as follows:
Let \tcode{C} denote the type
\tcode{iterator_traits<iterator_t<\exposid{Base}>>::iterator_category}.
\begin{itemize}
Expand Down Expand Up @@ -6601,7 +6601,7 @@
\end{codeblock}

\pnum
\tcode{\exposid{iterator}::iterator_concept} is defined as follows:
\tcode{\exposid{iterator}::iterator_concept} is determined as follows:
\begin{itemize}
\item If \exposid{ref-is-glvalue} is \tcode{true},
\exposid{Base} models \libconcept{bidirectional_range}, and
Expand All @@ -6616,12 +6616,12 @@
\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}.
In that case,
\tcode{iterator::iter\-ator_category} is defined as follows:
\tcode{iterator::iter\-ator_category} is determined as follows:
\begin{itemize}
\item Let \placeholder{OUTERC} denote
\tcode{iterator_traits<iterator_t<\exposid{Base}>>::iterator_category}, and
Expand Down Expand Up @@ -7170,7 +7170,7 @@
\end{codeblock}

\pnum
\tcode{\exposid{iterator}::iterator_concept} is defined as follows:
\tcode{\exposid{iterator}::iterator_concept} is determined as follows:
\begin{itemize}
\item
If \exposid{ref-is-glvalue} is \tcode{true},
Expand All @@ -7187,11 +7187,11 @@
\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,
\tcode{\exposid{iterator}::iterator_category} is defined as follows:
\tcode{\exposid{iterator}::iterator_category} is determined as follows:

\begin{itemize}
\item
Expand Down Expand Up @@ -9037,7 +9037,7 @@

\pnum
The member \grammarterm{typedef-name} \tcode{iterator_concept}
is defined as follows:
is determined as follows:
\begin{itemize}
\item
If \exposid{Base} models \libconcept{random_access_range},
Expand All @@ -9053,9 +9053,9 @@
\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:
In that case, \tcode{iterator_category} is determined as follows:
Let \tcode{C} denote the type
\tcode{iterator_traits<iterator_t<\exposid{Base}>>::iterator_category}.
\begin{itemize}
Expand Down Expand Up @@ -9641,7 +9641,7 @@
\pnum
The member \grammarterm{typedef-name}
\tcode{\exposid{iterator}::iterator_concept}
is defined as follows:
is determined as follows:
\begin{itemize}
\item
If \exposid{Base} models \libconcept{random_access_range},
Expand Down Expand Up @@ -10226,7 +10226,7 @@
\end{codeblock}

\pnum
\tcode{\exposid{iterator}::iterator_concept} is defined as follows:
\tcode{\exposid{iterator}::iterator_concept} is determined as follows:
\begin{itemize}
\item
If \tcode{\exposconcept{all-random-access}<Const, Views...>} is modeled,
Expand Down Expand Up @@ -10841,9 +10841,9 @@
\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:
\tcode{\exposid{iterator}::iterator_category} is determined as follows:
\begin{itemize}
\item
If
Expand Down Expand Up @@ -11367,7 +11367,7 @@
\end{codeblock}

\pnum
\tcode{\exposid{iterator}::iterator_concept} is defined as follows:
\tcode{\exposid{iterator}::iterator_concept} is determined as follows:
\begin{itemize}
\item
If \exposid{Base} models \libconcept{random_access_range},
Expand Down Expand Up @@ -12001,7 +12001,7 @@

\pnum
The member \grammarterm{typedef-name} \tcode{\exposid{iterator}::iterator_category}
is defined as follows:
is determined as follows:
\begin{itemize}
\item
If \tcode{invoke_result_t<\exposid{maybe-const}<Const, F>\&,
Expand Down Expand Up @@ -12995,7 +12995,7 @@
\end{codeblock}

\pnum
\tcode{\exposid{iterator}::iterator_concept} is defined as follows:
\tcode{\exposid{iterator}::iterator_concept} is determined as follows:
\begin{itemize}
\item
If \exposid{Base} models \libconcept{random_access_range},
Expand Down Expand Up @@ -13591,7 +13591,7 @@
\end{codeblock}

\pnum
\tcode{\exposid{iterator}::iterator_concept} is defined as follows:
\tcode{\exposid{iterator}::iterator_concept} is determined as follows:
\begin{itemize}
\item
If \exposid{Base} models \libconcept{random_access_range},
Expand Down Expand Up @@ -14186,7 +14186,7 @@
\end{codeblock}

\pnum
\tcode{\exposid{iterator}::iterator_concept} is defined as follows:
\tcode{\exposid{iterator}::iterator_concept} is determined as follows:
\begin{itemize}
\item
If \tcode{V} models \libconcept{bidirectional_range},
Expand Down Expand Up @@ -14524,7 +14524,7 @@
\end{codeblock}

\pnum
\tcode{\exposid{iterator}::iterator_concept} is defined as follows:
\tcode{\exposid{iterator}::iterator_concept} is determined as follows:
\begin{itemize}
\item
If \exposid{Base} models \libconcept{random_access_range},
Expand All @@ -14540,10 +14540,10 @@
\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:
\tcode{\exposid{iterator}::iterator_category} is determined as follows:
\begin{itemize}
\item
Let \tcode{C} denote
Expand Down Expand Up @@ -15246,7 +15246,7 @@
\end{codeblock}

\pnum
\tcode{\exposid{iterator}::iterator_concept} is defined as follows:
\tcode{\exposid{iterator}::iterator_concept} is determined as follows:
\begin{itemize}
\item
If \tcode{\exposconcept{cartesian-product-is-random-access}<Const, First, Vs...>}
Expand Down
Loading

0 comments on commit 10e34ad

Please # to comment.