Skip to content

Commit 2a1fbb9

Browse files
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.
1 parent cc902d3 commit 2a1fbb9

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

source/basic.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6449,7 +6449,7 @@
64496449
Expressions appearing in the \grammarterm{compound-statement} of a \grammarterm{lambda-expression}
64506450
are not subexpressions of the \grammarterm{lambda-expression}.
64516451
\end{note}
6452-
The \defnadjx{potentially-evaluated}{subexpressions}{subexpression} of
6452+
The \defnadjx{potentially evaluated}{subexpressions}{subexpression} of
64536453
an expression, conversion, or \grammarterm{initializer} $E$ are
64546454
\begin{itemize}
64556455
\item

source/classes.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@
722722
defaulted default constructor for the enclosing class or the
723723
exception specification of that constructor.
724724
An immediate invocation\iref{expr.const.imm} that
725-
is a potentially-evaluated subexpression\iref{intro.execution}
725+
is a potentially evaluated subexpression\iref{intro.execution}
726726
of a default member initializer
727727
is neither evaluated nor checked for whether it
728728
is a constant expression at the point where the subexpression appears.

source/declarations.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4393,7 +4393,7 @@
43934393
default argument are looked up, and the semantic constraints are checked,
43944394
at the point where the default argument appears, except that
43954395
an immediate invocation\iref{expr.const.imm} that
4396-
is a potentially-evaluated subexpression\iref{intro.execution} of
4396+
is a potentially evaluated subexpression\iref{intro.execution} of
43974397
the \grammarterm{initializer-clause} in a \grammarterm{parameter-declaration} is
43984398
neither evaluated
43994399
nor checked for whether it is a constant expression at that point.
@@ -5800,7 +5800,7 @@
58005800

58015801
\pnum
58025802
If a member has a default member initializer
5803-
and a potentially-evaluated subexpression thereof is an aggregate
5803+
and a potentially evaluated subexpression thereof is an aggregate
58045804
initialization that would use that default member initializer,
58055805
the program is ill-formed.
58065806
\begin{example}

source/expressions.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5480,7 +5480,7 @@
54805480
An \grammarterm{await-expression} shall not appear in the initializer of
54815481
a block variable with static or thread storage duration.
54825482
An \grammarterm{await-expression} shall not be
5483-
a potentially-evaluated subexpression
5483+
a potentially evaluated subexpression
54845484
of the predicate of a contract assertion\iref{basic.contract}.
54855485
A context within a function where an \grammarterm{await-expression} can appear
54865486
is called a \term{suspension context} of the function.
@@ -9513,7 +9513,7 @@
95139513
is the program point $P$ determined as follows:
95149514
\begin{itemize}
95159515
\item
9516-
If $E$ is a potentially-evaluated subexpression of
9516+
If $E$ is a potentially evaluated subexpression of
95179517
a default member initializer $I$, and
95189518
$V$ is the evaluation of $E$ in the evaluation of $I$
95199519
as an immediate subexpression of a (possibly aggregate) initialization, then
@@ -9526,7 +9526,7 @@
95269526

95279527
\item
95289528
Otherwise,
9529-
if $E$ is a potentially-evaluated subexpression of
9529+
if $E$ is a potentially evaluated subexpression of
95309530
a default argument $A$\iref{dcl.fct.default}, and
95319531
$V$ is the evaluation of $E$ in the evaluation of $A$ as
95329532
an immediate subexpression of a function call\iref{expr.call}, then
@@ -9668,7 +9668,7 @@
96689668
or
96699669

96709670
\item
9671-
a potentially-evaluated subexpression\iref{intro.execution} of one of the above.
9671+
a potentially evaluated subexpression\iref{intro.execution} of one of the above.
96729672
\end{itemize}
96739673

96749674
\indextext{function!needed for constant evaluation}%

source/meta.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5219,7 +5219,7 @@
52195219
let \tcode{\exposid{eval-point}($P$)} be the following program point:
52205220
\begin{itemize}
52215221
\item
5222-
If a potentially-evaluated subexpression\iref{intro.execution}
5222+
If a potentially evaluated subexpression\iref{intro.execution}
52235223
of a default member initializer $I$
52245224
for a member of class $C$\iref{class.mem.general}
52255225
appears at $P$,
@@ -5239,7 +5239,7 @@
52395239
corresponding to the constructor definition that is using $I$.
52405240
\end{itemize}
52415241
\item
5242-
Otherwise, if a potentially-evaluated subexpression
5242+
Otherwise, if a potentially evaluated subexpression
52435243
of a default argument\iref{dcl.fct.default} appears at $P$,
52445244
\tcode{\exposid{eval-point}($Q$)},
52455245
where $Q$ is the point at which the invocation of the function\iref{expr.call}

0 commit comments

Comments
 (0)