From 2a1fbb969d8e1532ac2189962a45d5421e6e481e Mon Sep 17 00:00:00 2001 From: "A. Jiang" Date: Fri, 10 Apr 2026 10:33:49 +0800 Subject: [PATCH] Unhyphenate "potentially-evaluated" Currently we define unhyphenated "_potentially evaluated_" in [basic.def.odr]/3 for expressions and conversions, but also define hyphenated "_potentially-evaluated subexpressions_" in [intro.execution]/4. It's probably better to use a single form, and the hyphen shouldn't b used for compounds modifying a noun if an adverb ending in "ly" is used. --- source/basic.tex | 2 +- source/classes.tex | 2 +- source/declarations.tex | 4 ++-- source/expressions.tex | 8 ++++---- source/meta.tex | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/basic.tex b/source/basic.tex index 7aac6e400e..e895a66fe7 100644 --- a/source/basic.tex +++ b/source/basic.tex @@ -6449,7 +6449,7 @@ Expressions appearing in the \grammarterm{compound-statement} of a \grammarterm{lambda-expression} are not subexpressions of the \grammarterm{lambda-expression}. \end{note} -The \defnadjx{potentially-evaluated}{subexpressions}{subexpression} of +The \defnadjx{potentially evaluated}{subexpressions}{subexpression} of an expression, conversion, or \grammarterm{initializer} $E$ are \begin{itemize} \item diff --git a/source/classes.tex b/source/classes.tex index 08134ae8b9..e2aca34011 100644 --- a/source/classes.tex +++ b/source/classes.tex @@ -722,7 +722,7 @@ defaulted default constructor for the enclosing class or the exception specification of that constructor. An immediate invocation\iref{expr.const.imm} that -is a potentially-evaluated subexpression\iref{intro.execution} +is a potentially evaluated subexpression\iref{intro.execution} of a default member initializer is neither evaluated nor checked for whether it is a constant expression at the point where the subexpression appears. diff --git a/source/declarations.tex b/source/declarations.tex index 2cf20c3632..998ec23d1d 100644 --- a/source/declarations.tex +++ b/source/declarations.tex @@ -4393,7 +4393,7 @@ default argument are looked up, and the semantic constraints are checked, at the point where the default argument appears, except that an immediate invocation\iref{expr.const.imm} that -is a potentially-evaluated subexpression\iref{intro.execution} of +is a potentially evaluated subexpression\iref{intro.execution} of the \grammarterm{initializer-clause} in a \grammarterm{parameter-declaration} is neither evaluated nor checked for whether it is a constant expression at that point. @@ -5800,7 +5800,7 @@ \pnum If a member has a default member initializer -and a potentially-evaluated subexpression thereof is an aggregate +and a potentially evaluated subexpression thereof is an aggregate initialization that would use that default member initializer, the program is ill-formed. \begin{example} diff --git a/source/expressions.tex b/source/expressions.tex index ea8b1848a5..ba828ade93 100644 --- a/source/expressions.tex +++ b/source/expressions.tex @@ -5480,7 +5480,7 @@ An \grammarterm{await-expression} shall not appear in the initializer of a block variable with static or thread storage duration. An \grammarterm{await-expression} shall not be -a potentially-evaluated subexpression +a potentially evaluated subexpression of the predicate of a contract assertion\iref{basic.contract}. A context within a function where an \grammarterm{await-expression} can appear is called a \term{suspension context} of the function. @@ -9513,7 +9513,7 @@ is the program point $P$ determined as follows: \begin{itemize} \item -If $E$ is a potentially-evaluated subexpression of +If $E$ is a potentially evaluated subexpression of a default member initializer $I$, and $V$ is the evaluation of $E$ in the evaluation of $I$ as an immediate subexpression of a (possibly aggregate) initialization, then @@ -9526,7 +9526,7 @@ \item Otherwise, -if $E$ is a potentially-evaluated subexpression of +if $E$ is a potentially evaluated subexpression of a default argument $A$\iref{dcl.fct.default}, and $V$ is the evaluation of $E$ in the evaluation of $A$ as an immediate subexpression of a function call\iref{expr.call}, then @@ -9668,7 +9668,7 @@ or \item -a potentially-evaluated subexpression\iref{intro.execution} of one of the above. +a potentially evaluated subexpression\iref{intro.execution} of one of the above. \end{itemize} \indextext{function!needed for constant evaluation}% diff --git a/source/meta.tex b/source/meta.tex index b2a168331b..f10c1b68ed 100644 --- a/source/meta.tex +++ b/source/meta.tex @@ -5219,7 +5219,7 @@ let \tcode{\exposid{eval-point}($P$)} be the following program point: \begin{itemize} \item - If a potentially-evaluated subexpression\iref{intro.execution} + If a potentially evaluated subexpression\iref{intro.execution} of a default member initializer $I$ for a member of class $C$\iref{class.mem.general} appears at $P$, @@ -5239,7 +5239,7 @@ corresponding to the constructor definition that is using $I$. \end{itemize} \item - Otherwise, if a potentially-evaluated subexpression + Otherwise, if a potentially evaluated subexpression of a default argument\iref{dcl.fct.default} appears at $P$, \tcode{\exposid{eval-point}($Q$)}, where $Q$ is the point at which the invocation of the function\iref{expr.call}