From 10e34ada855e6cc92ee6d78c7ffa371beca7dcea Mon Sep 17 00:00:00 2001 From: "A. Jiang" Date: Thu, 27 Jul 2023 07:38:44 +0800 Subject: [PATCH] Don't define typedef-names in the library wording --- source/iterators.tex | 22 ++++++++--------- source/meta.tex | 16 ++++++------ source/ranges.tex | 58 ++++++++++++++++++++++---------------------- source/support.tex | 6 ++--- source/threads.tex | 6 ++--- source/utilities.tex | 2 +- 6 files changed, 55 insertions(+), 55 deletions(-) diff --git a/source/iterators.tex b/source/iterators.tex index 21f233d8be..5a50bbc4be 100644 --- a/source/iterators.tex +++ b/source/iterators.tex @@ -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. @@ -896,7 +896,7 @@ \begin{codeblock} iterator_traits::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}% @@ -904,7 +904,7 @@ iterator_traits::pointer iterator_traits::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 @@ -922,7 +922,7 @@ iterator_traits::difference_type iterator_traits::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 @@ -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 @@ -2756,7 +2756,7 @@ For every iterator of type \tcode{I}, \tcode{iterator_traits::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::it\-er\-a\-tor_con\-cept} @@ -4359,7 +4359,7 @@ \rSec3[const.iterators.types]{Member types} \pnum -\tcode{basic_const_iterator::iterator_concept} is defined as follows: +\tcode{basic_const_iterator::iterator_concept} is determined as follows: \begin{itemize} \item If \tcode{Iterator} models \libconcept{contiguous_iterator}, @@ -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_category} denotes @@ -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 @@ -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::iterator_category} is valid and denotes a type. @@ -5488,7 +5488,7 @@ \pnum The nested \grammarterm{typedef-name}s of the specialization of -\tcode{iterator_traits} for \tcode{common_iterator} are defined as follows. +\tcode{iterator_traits} for \tcode{common_iterator} are determined as follows. \begin{itemize} \item \tcode{iterator_concept} denotes \tcode{forward_iterator_tag} diff --git a/source/meta.tex b/source/meta.tex index 82c1f374c9..0cae04cc8d 100644 --- a/source/meta.tex +++ b/source/meta.tex @@ -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 @@ -1904,7 +1904,7 @@ \tcode{template} \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 @@ -1922,7 +1922,7 @@ \indexlibraryglobal{common_reference}% \tcode{template} \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 @@ -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}. @@ -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}. @@ -2180,7 +2180,7 @@ \pnum \begin{example} -Given these definitions: +Given these declarations and definitions: \begin{codeblock} using PF1 = bool (&)(); using PF2 = short (*)(long); @@ -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. diff --git a/source/ranges.tex b/source/ranges.tex index eaddf6ba39..163a79bbf0 100644 --- a/source/ranges.tex +++ b/source/ranges.tex @@ -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}. @@ -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}. @@ -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_category}. @@ -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}. @@ -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_category}. \begin{itemize} @@ -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 @@ -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_category}, and @@ -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}, @@ -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 @@ -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}, @@ -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_category}. \begin{itemize} @@ -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}, @@ -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}} is modeled, @@ -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 @@ -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}, @@ -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}\&, @@ -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}, @@ -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}, @@ -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}, @@ -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}, @@ -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 @@ -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}} diff --git a/source/support.tex b/source/support.tex index f9fb1a8c81..cfb0c60fbc 100644 --- a/source/support.tex +++ b/source/support.tex @@ -1947,10 +1947,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 @@ -1961,7 +1961,7 @@ \rSec2[stdfloat.syn]{Header \tcode{} 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}. diff --git a/source/threads.tex b/source/threads.tex index 7f294c2a5c..27280e0fd5 100644 --- a/source/threads.tex +++ b/source/threads.tex @@ -2428,10 +2428,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}% @@ -5960,7 +5960,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 diff --git a/source/utilities.tex b/source/utilities.tex index de5b358b4b..89dbc96066 100644 --- a/source/utilities.tex +++ b/source/utilities.tex @@ -16394,7 +16394,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(value), 16) \end{codeblock}