Apply suggested changes

sdkrystian · sdkrystian · commit 5485b4543a88 · 2020-03-12T23:30:58.000-04:00
diff --git a/source/declarations.tex b/source/declarations.tex
@@ -2519,25 +2519,15 @@
 both the \grammarterm{decl-specifier-seq} and its \grammarterm{declarator}.
 
 \pnum
-Thus, a declaration of a particular identifier has the form
-\tcode{T} \tcode{D} where \tcode{T}
-is of the form \opt{\grammarterm{attribute-specifier-seq}}
-\grammarterm{decl-specifier-seq}
-and \tcode{D} is a declarator.
-Following is a recursive procedure for determining
-the type specified for the contained
-\grammarterm{declarator-id}
-by such a declaration.
+Thus, a declaration of a particular \grammarterm{declarator-id} has the form
+\opt{\grammarterm{attribute-specifier-seq}} \grammarterm{decl-specifier-seq}
+\grammarterm{declarator}. The optional \grammarterm{attribute-specifier-seq}
+appertains to the declared entity. Following is a recursive procedure for
+determining the type of the \grammarterm{declarator-id} and the entity which it declares.
 
 \pnum
-First, the type \tcode{T} is determined.
-In a declaration of the form
-\begin{ncsimplebnf}
-\opt{attribute-specifier-seq} decl-specifier-seq \terminal{D}
-\end{ncsimplebnf}
-the \grammarterm{decl-specifier-seq} determines the type \tcode{T}.
-The optional \grammarterm{attribute-specifier-seq} appertains
-to the entity declared by \tcode{D}.
+First, a type \tcode{T} is determined from
+the \grammarterm{decl-specifier-seq}. 
 \begin{example}
 In the declaration
 \begin{codeblock}
@@ -2551,27 +2541,20 @@
 \end{example}
 
 \pnum
-In a declaration \tcode{T} \tcode{D}
-where \tcode{D} has the form
+A \grammarterm{declarator} of the form
 \begin{ncsimplebnf}
 declarator-id \opt{attribute-specifier-seq}
 \end{ncsimplebnf}
-the type of the \grammarterm{declarator-id}
-in \tcode{D} is ``\tcode{T}''.
+determines the type of its
+\grammarterm{declarator-id} to be ``\tcode{T}''. 
 The optional \grammarterm{attribute-specifier-seq}
-appertains to the entity declared by \tcode{D}.
+appertains to the declared entity.
 
 \pnum
-In a declaration
-\tcode{T} \tcode{D} where
-\tcode{D} has the form
-\begin{ncsimplebnf}
-\terminal{(} \terminal{D1} \terminal{)}
-\end{ncsimplebnf}
-the type of the \grammarterm{declarator-id}
-in \tcode{D} is the same as that of the
-contained \grammarterm{declarator-id}
-in the declaration \tcode{T} \tcode{D1}.
+A \grammarterm{declarator} of the form \tcode{(D)}
+determines the type of its \grammarterm{declarator-id}
+to be that of the \grammarterm{declarator-id}
+in the declaration \tcode{T} \tcode{D}.
 \indextext{declaration!parentheses in}%
 \begin{note}
 Parentheses do not alter the type of the embedded
@@ -2583,34 +2566,20 @@
 \indextext{declarator!pointer}%
 
 \pnum
-In a declaration
-\tcode{T}
-\tcode{D}
-where
-\tcode{D}
-has the form
+A \grammarterm{declarator} of the form
 \begin{ncsimplebnf}
-\terminal{*} \opt{attribute-specifier-seq} \opt{cv-qualifier-seq} \terminal{D1}
+\terminal{*} \opt{attribute-specifier-seq} \opt{cv-qualifier-seq} \terminal{D}
 \end{ncsimplebnf}
-and the type of the contained
-\grammarterm{declarator-id}
-in the declaration
-\tcode{T}
-\tcode{D1}
-is ``\placeholder{derived-declarator-type-list}
-\tcode{T}'',
-then the type of the
-\grammarterm{declarator-id}
-in
-\tcode{D}
-is ``\placeholder{derived-declarator-type-list} \grammarterm{cv-qualifier-seq} pointer to
-\tcode{T}''.
+determines the type of its \grammarterm{declarator-id} to be
+that of the \grammarterm{declarator-id} in the declaration
+\tcode{U} \tcode{D}, where \tcode{U} is a \grammarterm{type-specifier} denoting
+the type ``\grammarterm{cv-qualifier-seq} pointer to \tcode{T}''.
 \indextext{declaration!pointer}%
 \indextext{declaration!constant pointer}%
-The
-\grammarterm{cv-qualifier}{s}
-apply to the pointer and not to the object pointed to.
-Similarly, the optional \grammarterm{attribute-specifier-seq}\iref{dcl.attr.grammar} appertains to the pointer and not to the object pointed to.
+The \grammarterm{cv-qualifier}{s} apply to the pointer
+and not to the object pointed to.
+Similarly, the optional \grammarterm{attribute-specifier-seq}\iref{dcl.attr.grammar}
+appertains to the pointer and not to the object pointed to.
 
 \pnum
 \begin{example}
@@ -2692,29 +2661,15 @@
 \indextext{declarator!reference}
 
 \pnum
-In a declaration
-\tcode{T}
-\tcode{D}
-where
-\tcode{D}
-has either of the forms
+A \grammarterm{declarator} having either of the forms
 \begin{ncsimplebnf}
-\terminal{\&} \opt{attribute-specifier-seq} \terminal{D1}\br
-\terminal{\&\&} \opt{attribute-specifier-seq} \terminal{D1}
+\terminal{\&} \opt{attribute-specifier-seq} \terminal{D}\br
+\terminal{\&\&} \opt{attribute-specifier-seq} \terminal{D}
 \end{ncsimplebnf}
-and the type of the contained
-\grammarterm{declarator-id}
-in the declaration
-\tcode{T}
-\tcode{D1}
-is ``\placeholder{derived-declarator-type-list}
-\tcode{T}'',
-then the type of the
-\grammarterm{declarator-id}
-in
-\tcode{D}
-is ``\placeholder{derived-declarator-type-list} reference to
-\tcode{T}''.
+determines the type of its \grammarterm{declarator-id} to be
+that of the \grammarterm{declarator-id} in the declaration
+\tcode{U} \tcode{D}, where \tcode{U} is a \grammarterm{type-specifier}
+denoting the type ``reference to \tcode{T}''.
 The optional \grammarterm{attribute-specifier-seq} appertains to the reference type.
 Cv-qualified references are ill-formed except when the cv-qualifiers
 are introduced through the use of a
@@ -2883,34 +2838,18 @@
 \indextext{pointer to member}%
 
 \pnum
-In a declaration
-\tcode{T}
-\tcode{D}
-where
-\tcode{D}
-has the form
+A \grammarterm{declarator} of the form
 \begin{ncsimplebnf}
-nested-name-specifier \terminal{*} \opt{attribute-specifier-seq} \opt{cv-qualifier-seq} \terminal{D1}
+nested-name-specifier \terminal{*} \opt{attribute-specifier-seq} \opt{cv-qualifier-seq} \terminal{D}
 \end{ncsimplebnf}
-and the
-\grammarterm{nested-name-specifier}
-denotes a class,
-and the type of the contained
-\grammarterm{declarator-id}
-in the declaration
-\tcode{T}
-\tcode{D1}
-is ``\placeholder{derived-declarator-type-list}
-\tcode{T}'',
-then the type of the
-\grammarterm{declarator-id}
-in
-\tcode{D}
-is ``\placeholder{derived-declarator-type-list} \grammarterm{cv-qualifier-seq} pointer to member of class
-\grammarterm{nested-name-specifier} of type
-\tcode{T}''.
-The optional \grammarterm{attribute-specifier-seq}\iref{dcl.attr.grammar} appertains to the
-pointer-to-member.
+where the \grammarterm{nested-name-specifier} denotes a class type
+determines the type of its \grammarterm{declarator-id} to be
+that of the \grammarterm{declarator-id} in the declaration
+\tcode{U} \tcode{D}, where \tcode{U} is a \grammarterm{type-specifier}
+denoting the type ``\grammarterm{cv-qualifier-seq} pointer to member of class
+\grammarterm{nested-name-specifier} of type \tcode{T}''.
+The optional \grammarterm{attribute-specifier-seq}\iref{dcl.attr.grammar}
+appertains to the pointer-to-member.
 
 \pnum
 \begin{example}
@@ -2992,42 +2931,38 @@
 \indextext{declarator!array}
 
 \pnum
-In a declaration \tcode{T} \tcode{D} where \tcode{D} has the form
+A \grammarterm{declarator} of the form
 \begin{ncsimplebnf}
-\terminal{D1} \terminal{[} \opt{constant-expression} \terminal{]} \opt{attribute-specifier-seq}
+\terminal{D} \terminal{[} constant-expression \terminal{]} \opt{attribute-specifier-seq}
 \end{ncsimplebnf}
-and the type of the contained \grammarterm{declarator-id}
-in the declaration \tcode{T} \tcode{D1}
-is ``\placeholder{derived-declarator-type-list} \tcode{T}'',
-the type of the \grammarterm{declarator-id} in \tcode{D} is
-``\placeholder{derived-declarator-type-list} array of \tcode{N} \tcode{T}''.
-The \grammarterm{constant-expression}
-shall be a converted constant expression of type \tcode{std::size_t}\iref{expr.const}.
+where the \grammarterm{constant-expression} is a converted constant expression
+of type \tcode{std::size_t}\iref{expr.const}
+determines the type of its \grammarterm{declarator-id} to be
+that of the \grammarterm{declarator-id} in the declaration
+\tcode{U} \tcode{D}, where \tcode{U} is a \grammarterm{type-specifier}
+denoting the type ``array of \tcode{N} \tcode{T}'' and \tcode{N} is the
+value of the \grammarterm{constant-expression}.
 \indextext{bound, of array}%
-Its value \tcode{N} specifies the \defnx{array bound}{array!bound},
-i.e., the number of elements in the array;
-\tcode{N} shall be greater than zero.
+The \defnx{array bound}{array!bound} \tcode{N} shall be greater than zero.
+The optional \grammarterm{attribute-specifier-seq}
+appertains to the array type.
 
 \pnum
-In a declaration \tcode{T} \tcode{D} where \tcode{D} has the form
+A \grammarterm{declarator} of the form
 \begin{ncsimplebnf}
-\terminal{D1 [ ]} \opt{attribute-specifier-seq}
+\terminal{D [ ]} \opt{attribute-specifier-seq}
 \end{ncsimplebnf}
-and the type of the contained \grammarterm{declarator-id}
-in the declaration \tcode{T} \tcode{D1}
-is ``\placeholder{derived-declarator-type-list} \tcode{T}'',
-the type of the \grammarterm{declarator-id} in \tcode{D} is
-``\placeholder{derived-declarator-type-list} array of unknown bound of \tcode{T}'', except as specified below.
+determines the type of its \grammarterm{declarator-id} to be
+that of the \grammarterm{declarator-id} in the declaration
+\tcode{U} \tcode{D}, where \tcode{U} is a \grammarterm{type-specifier}
+denoting the type ``array of unknown bound of \tcode{T}'', except as specified below.
+The optional \grammarterm{attribute-specifier-seq} appertains to the array type.
 
 \pnum
 \indextext{declaration!array}%
-A type of the form ``array of \tcode{N} \tcode{U}'' or
-``array of unknown bound of \tcode{U}'' is an \defn{array type}.
-The optional \grammarterm{attribute-specifier-seq}
-appertains to the array type.
-
-\pnum
-\tcode{U} is called the array \defn{element type};
+A type of the form ``array of \tcode{N} \tcode{E}'' or
+``array of unknown bound of \tcode{E}'' is an \defn{array type}.
+\tcode{E} is called the array \defn{element type};
 this type shall not be
 a placeholder type\iref{dcl.spec.auto},
 a reference type,
@@ -3053,10 +2988,10 @@
 
 \pnum
 Any type of the form
-``\grammarterm{cv-qualifier-seq} array of \tcode{N} \tcode{U}''
+``\grammarterm{cv-qualifier-seq} array of \tcode{N} \tcode{E}''
 is adjusted to
-``array of \tcode{N} \grammarterm{cv-qualifier-seq} \tcode{U}'',
-and similarly for ``array of unknown bound of \tcode{U}''.
+``array of \tcode{N} \grammarterm{cv-qualifier-seq} \tcode{E}'',
+and similarly for ``array of unknown bound of \tcode{E}''.
 \begin{example}
 \begin{codeblock}
 typedef int A[5], AA[2][3];
@@ -3065,14 +3000,14 @@
 \end{codeblock}
 \end{example}
 \begin{note}
-An ``array of \tcode{N} \grammarterm{cv-qualifier-seq} \tcode{U}''
+An ``array of \tcode{N} \grammarterm{cv-qualifier-seq} \tcode{E}''
 has cv-qualified type; see~\ref{basic.type.qualifier}.
 \end{note}
 
 \pnum
-An object of type ``array of \tcode{N} \tcode{U}'' contains
+An object of type ``array of \tcode{N} \tcode{E}'' contains
 a contiguously allocated non-empty set
-of \tcode{N} subobjects of type \tcode{U},
+of \tcode{N} subobjects of type \tcode{E},
 known as the \defnx{elements}{array!element} of the array,
 and numbered \tcode{0} to \tcode{N-1}.
 
@@ -3088,7 +3023,7 @@
 In these cases, the array bound is calculated
 from the number of initial elements (say, \tcode{N})
 supplied\iref{dcl.init.aggr},
-and the type of the array is ``array of \tcode{N} \tcode{U}''.
+and the type of the array is ``array of \tcode{N} \tcode{E}''.
 
 \pnum
 Furthermore, if there is a preceding declaration of the entity in the same
@@ -3194,34 +3129,17 @@
 
 \pnum
 \indextext{type!function}%
-In a declaration
-\tcode{T}
-\tcode{D}
-where
-\tcode{D}
-has the form
+A \grammarterm{declarator} of the form
 \begin{ncsimplebnf}
-\terminal{D1} \terminal{(} parameter-declaration-clause \terminal{)} \opt{cv-qualifier-seq}\br
+\terminal{D} \terminal{(} parameter-declaration-clause \terminal{)} \opt{cv-qualifier-seq}\br
 \bnfindent\opt{ref-qualifier} \opt{noexcept-specifier} \opt{attribute-specifier-seq}
 \end{ncsimplebnf}
-and the type of the contained
-\grammarterm{declarator-id}
-in the declaration
-\tcode{T}
-\tcode{D1}
-is
-``\placeholder{derived-declarator-type-list}
-\tcode{T}'',
-the type of the
-\grammarterm{declarator-id}
-in
-\tcode{D}
-is
-``\placeholder{derived-declarator-type-list}
-\opt{\tcode{noexcept}}
-function of parameter-type-list
+determines the type of its \grammarterm{declarator-id} to be
+that of the \grammarterm{declarator-id} in the declaration
+\tcode{U} \tcode{D}, where \tcode{U} is a \grammarterm{type-specifier}
+denoting the type ``\opt{\tcode{noexcept}} function of parameter-type-list
 \opt{\grammarterm{cv-qualifier-seq}} \opt{\grammarterm{ref-qualifier}}
-returning \tcode{T}'', where
+returning \tcode{T}'', and
 \begin{itemize}
 \item
 the parameter-type-list is derived from
@@ -3231,43 +3149,27 @@
 the exception specification\iref{except.spec} is non-throwing.
 \end{itemize}
 The optional \grammarterm{attribute-specifier-seq}
-appertains to the function type.
+appertains to the function type. 
 
 \pnum
-In a declaration
-\tcode{T}
-\tcode{D}
-where
-\tcode{D}
-has the form
+A \grammarterm{declarator} of the form
 \begin{ncsimplebnf}
-\terminal{D1} \terminal{(} parameter-declaration-clause \terminal{)} \opt{cv-qualifier-seq}\br
+\terminal{D} \terminal{(} parameter-declaration-clause \terminal{)} \opt{cv-qualifier-seq}\br
 \bnfindent\opt{ref-qualifier} \opt{noexcept-specifier} \opt{attribute-specifier-seq} trailing-return-type
 \end{ncsimplebnf}
-and the type of the contained
-\grammarterm{declarator-id}
-in the declaration
-\tcode{T}
-\tcode{D1}
-is
-``\placeholder{derived-declarator-type-list} \tcode{T}'',
-\tcode{T} shall be the single \grammarterm{type-specifier} \tcode{auto}.
-The type of the
-\grammarterm{declarator-id}
-in
-\tcode{D}
-is
-``\placeholder{derived-declarator-type-list}
-\opt{\tcode{noexcept}}
-function of parameter-type-list
+where \tcode{T} has the form ``\placeholder{type-list} \tcode{auto}'',
+the type of its \grammarterm{declarator-id} is determined to be
+that of the \grammarterm{declarator-id} in the declaration
+\tcode{U} \tcode{D}, where \tcode{U} is a \grammarterm{type-specifier}
+denoting the type ``\opt{\tcode{noexcept}} function of parameter-type-list
 \opt{\grammarterm{cv-qualifier-seq}} \opt{\grammarterm{ref-qualifier}}
-returning \tcode{U}'', where
+returning \tcode{V}'', and
 \begin{itemize}
 \item
 the parameter-type-list is derived from
 the \grammarterm{parameter-declaration-clause} as described below,
 \item
-\tcode{U} is the type specified by the \grammarterm{trailing-return-type}, and
+\tcode{V} is the type specified by the \grammarterm{trailing-return-type}, and
 \item
 the optional \tcode{noexcept} is present if and only if
 the exception specification is non-throwing.
