Skip to content

Commit 1178bcc

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 5c8fc43 commit 1178bcc

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
@@ -6352,7 +6352,7 @@
63526352
Expressions appearing in the \grammarterm{compound-statement} of a \grammarterm{lambda-expression}
63536353
are not subexpressions of the \grammarterm{lambda-expression}.
63546354
\end{note}
6355-
The \defnadjx{potentially-evaluated}{subexpressions}{subexpression} of
6355+
The \defnadjx{potentially evaluated}{subexpressions}{subexpression} of
63566356
an expression, conversion, or \grammarterm{initializer} $E$ are
63576357
\begin{itemize}
63586358
\item

source/classes.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@
718718
defaulted default constructor for the enclosing class or the
719719
exception specification of that constructor.
720720
An immediate invocation\iref{expr.const.imm} that
721-
is a potentially-evaluated subexpression\iref{intro.execution}
721+
is a potentially evaluated subexpression\iref{intro.execution}
722722
of a default member initializer
723723
is neither evaluated nor checked for whether it
724724
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
@@ -4382,7 +4382,7 @@
43824382
default argument are looked up, and the semantic constraints are checked,
43834383
at the point where the default argument appears, except that
43844384
an immediate invocation\iref{expr.const.imm} that
4385-
is a potentially-evaluated subexpression\iref{intro.execution} of
4385+
is a potentially evaluated subexpression\iref{intro.execution} of
43864386
the \grammarterm{initializer-clause} in a \grammarterm{parameter-declaration} is
43874387
neither evaluated
43884388
nor checked for whether it is a constant expression at that point.
@@ -5789,7 +5789,7 @@
57895789

57905790
\pnum
57915791
If a member has a default member initializer
5792-
and a potentially-evaluated subexpression thereof is an aggregate
5792+
and a potentially evaluated subexpression thereof is an aggregate
57935793
initialization that would use that default member initializer,
57945794
the program is ill-formed.
57955795
\begin{example}

source/expressions.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5464,7 +5464,7 @@
54645464
An \grammarterm{await-expression} shall not appear in the initializer of
54655465
a block variable with static or thread storage duration.
54665466
An \grammarterm{await-expression} shall not be
5467-
a potentially-evaluated subexpression
5467+
a potentially evaluated subexpression
54685468
of the predicate of a contract assertion\iref{basic.contract}.
54695469
A context within a function where an \grammarterm{await-expression} can appear
54705470
is called a \term{suspension context} of the function.
@@ -9387,13 +9387,13 @@
93879387
is a point $R$ determined as follows:
93889388
\begin{itemize}
93899389
\item
9390-
If a potentially-evaluated subexpression\iref{intro.execution} of
9390+
If a potentially evaluated subexpression\iref{intro.execution} of
93919391
a default member initializer $I$ appears at $P$, and
93929392
a (possibly aggregate) initialization during $V$ is using $I$,
93939393
then $R$ is $\textit{EVAL-PT}(Q)$
93949394
where $Q$ is the point at which that initialization appears.
93959395
\item
9396-
Otherwise, if a potentially-evaluated subexpression of
9396+
Otherwise, if a potentially evaluated subexpression of
93979397
a default argument\iref{dcl.fct.default} appears at $P$, and
93989398
an invocation of a function\iref{expr.call} during $V$
93999399
is using that default argument,
@@ -9482,7 +9482,7 @@
94829482
or
94839483

94849484
\item
9485-
a potentially-evaluated subexpression\iref{intro.execution} of one of the above.
9485+
a potentially evaluated subexpression\iref{intro.execution} of one of the above.
94869486
\end{itemize}
94879487

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

source/meta.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5181,7 +5181,7 @@
51815181
let \tcode{\exposid{eval-point}($P$)} be the following program point:
51825182
\begin{itemize}
51835183
\item
5184-
If a potentially-evaluated subexpression\iref{intro.execution}
5184+
If a potentially evaluated subexpression\iref{intro.execution}
51855185
of a default member initializer $I$
51865186
for a member of class $C$\iref{class.mem.general}
51875187
appears at $P$,
@@ -5201,7 +5201,7 @@
52015201
corresponding to the constructor definition that is using $I$.
52025202
\end{itemize}
52035203
\item
5204-
Otherwise, if a potentially-evaluated subexpression
5204+
Otherwise, if a potentially evaluated subexpression
52055205
of a default argument\iref{dcl.fct.default} appears at $P$,
52065206
\tcode{\exposid{eval-point}($Q$)},
52075207
where $Q$ is the point at which the invocation of the function\iref{expr.call}

0 commit comments

Comments
 (0)