Switching to single-object delete expression and array delete expression as terms

Author: Aaron Ballman

source/expressions.tex

@@ -3993,11 +3993,13 @@
     \terminal{::}\opt{} \terminal{delete [ ]} cast-expression
 \end{bnf}
 
-The first alternative is for non-array objects, and the second is for arrays. Whenever
-the \tcode{delete} keyword is immediately followed by empty square brackets, it shall be
-interpreted as the second alternative.\footnote{A lambda expression with a
-\grammarterm{lambda-introducer} that consists of
-empty square brackets can follow the \tcode{delete} keyword if the lambda expression is
+The first alternative is a
+\defnx{single-object delete expression}{delete!single-object}, and the
+second is an \defnx{array delete expression}{delete!array}.
+Whenever the \tcode{delete} keyword is immediately followed by empty square
+brackets, it shall be interpreted as the second alternative.\footnote{A lambda
+expression with a \grammarterm{lambda-introducer} that consists of empty square 
+brackets can follow the \tcode{delete} keyword if the lambda expression is
 enclosed in parentheses.}
 The operand shall be of pointer to object type or of class type. If of
 class type, the operand is contextually implicitly converted\iref{conv}
@@ -4009,23 +4011,20 @@
 \tcode{void}.
 
 \pnum
-\indextext{\idxcode{delete}!object}%
+\indextext{\idxcode{delete}!single-object}%
 If the operand has a class type, the operand is converted to a pointer
 type by calling the above-mentioned conversion function, and the
 converted operand is used in place of the original operand for the
 remainder of this section.
-In the first alternative
-(\defnx{delete object}{object!delete}), the value of the operand of \tcode{delete} may
-be a null pointer value, a pointer to a non-array object
+In a single-object delete expression, the value of the operand of
+\tcode{delete} may be a null pointer value, a pointer to a non-array object
 created by a previous \grammarterm{new-expression},
 or a pointer to a
 subobject\iref{intro.object} representing a base class of such an
 object\iref{class.derived}. If not, the behavior is undefined.
 \indextext{array!\idxcode{delete}}%
-In the second alternative (\defnx{delete array}{\idxcode{delete}!array}), the value of the
-operand of \tcode{delete}
-may be a null pointer value or a pointer value
-that resulted from
+In an array delete expression, the value of the operand of \tcode{delete}
+may be a null pointer value or a pointer value that resulted from
 a previous array \grammarterm{new-expression}.\footnote{For nonzero-length
 arrays, this is the same as a pointer to the first
 element of the array created by that \grammarterm{new-expression}.
@@ -4045,12 +4044,12 @@
 
 \pnum
 \indextext{\idxcode{delete}!undefined}%
-In the first alternative (delete object), if the static type of
-the object to be deleted is different from its dynamic type, the static type shall be
-a base class of the dynamic type of the object to be deleted and the static type shall
-have a virtual destructor or the behavior is undefined. In the second
-alternative (delete array) if the dynamic type of the object to
-be deleted differs from its static type, the behavior is undefined.
+In a single-object delete expression, if the static type of the object to be
+deleted is different from its dynamic type, the static type shall be a base
+class of the dynamic type of the object to be deleted and the static type shall
+have a virtual destructor or the behavior is undefined. In an array delete
+expression, if the dynamic type of the object to be deleted differs from its
+static type, the behavior is undefined.
 
 \pnum
 The \grammarterm{cast-expression} in a \grammarterm{delete-expression} shall
@@ -4155,9 +4154,9 @@
 \pnum
 When a \grammarterm{delete-expression}
 is executed, the selected deallocation function shall be called with
-the address of the most-derived object in the \term{delete object} case, or
-the address of the object suitably adjusted for
-the array allocation overhead\iref{expr.new} in the \term{delete array} case,
+the address of the most-derived object in a single-object delete expression, or
+the address of the object suitably adjusted for the array allocation
+overhead\iref{expr.new} in an array delete expression,
 as its first argument.
 If a deallocation function
 with a parameter of type \tcode{std::align_val_t}