[expr.log.and],[expr.log.or] improve wording symmetry and quality

Eisenwave · Eisenwave · commit 5a8e617421ae · 2023-09-20T11:24:30.000+02:00
diff --git a/source/expressions.tex b/source/expressions.tex
@@ -6810,20 +6810,21 @@
 \end{bnf}
 
 \pnum
-The \tcode{\&\&} operator groups left-to-right. The operands are both
-contextually converted to \keyword{bool}\iref{conv}.
-The
-result is \keyword{true} if both operands are \keyword{true} and
-\keyword{false} otherwise. Unlike \tcode{\&}, \tcode{\&\&} guarantees
-left-to-right evaluation: the second operand is not evaluated if the
-first operand is \keyword{false}.
+The \tcode{\&\&} operator groups left-to-right.
+The operands are both contextually converted to \keyword{bool}\iref{conv}.
+The result is
+\keyword{true} if both operands are \keyword{true} and
+\keyword{false} otherwise.
 
 \pnum
-The result is a \tcode{bool}.
 \indextext{operator!side effects and logical AND}%
-If the second expression is evaluated,
-the first expression is sequenced before
-the second expression\iref{intro.execution}.
+The right operand is not evaluated if the left operand evaluates to \keyword{false}.
+The evaluation of the left operand is sequenced before\iref{intro.execution}
+the evaluation (if any) of the right operand.
+\begin{note}
+The former behavior is sometimes called "short-circuiting".
+The \tcode{&} operator guarantees neither short-circuiting nor left-to-right evaluation.
+\end{note}
 
 \rSec2[expr.log.or]{Logical OR operator}%
 \indextext{expression!logical OR}%
@@ -6837,20 +6838,21 @@
 \end{bnf}
 
 \pnum
-The \tcode{||} operator groups left-to-right. The operands are both
-contextually converted to \keyword{bool}\iref{conv}.
+The \tcode{||} operator groups left-to-right.
+The operands are both contextually converted to \keyword{bool}\iref{conv}.
 The result is
 \keyword{true} if either of its operands is \keyword{true}, and
-\keyword{false} otherwise. Unlike \tcode{|}, \tcode{||} guarantees
-left-to-right evaluation; moreover, the second operand is not evaluated
-if the first operand evaluates to \keyword{true}.
+\keyword{false} otherwise.
 
 \pnum
-The result is a \keyword{bool}.
 \indextext{operator!side effects and logical OR}%
-If the second expression is evaluated,
-the first expression is sequenced before
-the second expression\iref{intro.execution}.
+The right operand is not evaluated if the left operand evaluates to \keyword{true}.
+The evaluation of the left operand is sequenced before\iref{intro.execution}
+the evaluation (if any) of the right operand.
+\begin{note}
+The former behavior is sometimes called "short-circuiting".
+The \tcode{|} operator guarantees neither short-circuiting nor left-to-right evaluation.
+\end{note}
 
 \rSec2[expr.cond]{Conditional operator}%
 \indextext{expression!conditional operator}%
