Skip to content

Commit e8eb962

Browse files
committed
[P4101] Escalating immediate constant expressions
1 parent bc0b123 commit e8eb962

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

4101_consteval_only_values/consteval-only-values.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ An invocation is an _immediate invocation_ if it [is a potentially-evaluated exp
545545
[24]{.pnum} A potentially-evaluated expression or conversion is _immediate-escalating_ if it is neither initially in an immediate function context nor a subexpression of an immediate invocation, and [either]{.addu}
546546
547547
* [#.1]{.pnum} it is an `$id-expression$` or `$splice-expression$` that designates an immediate function [or an immediate object, or]{.addu}
548-
* [#.2]{.pnum} it is an immediate invocation that is not a constant expression[, or]{.rm} [.]{.addu}
548+
* [#.2]{.pnum} it is an immediate invocation that [either]{.addu} is not a constant expression[,]{.rm} or [is an immediate constant expression.]{.addu}
549549
* [#.3]{.pnum} [it is of consteval-only type ([basic.types.general]).]{.rm}
550550
551551
[25]{.pnum} An *immediate-escalating* function is [...]

4101_consteval_only_values/p4101r-dan.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1496,7 +1496,9 @@ <h2 data-number="4.1" id="wording"><span class="header-section-number">4.1</span
14961496
designates an immediate function <span class="addu">or an immediate
14971497
object, or</span></li>
14981498
<li><span class="marginalizedparent"><a class="marginalized" href="#pnum_66" id="pnum_66">(24.2)</a></span>
1499-
it is an immediate invocation that is not a constant expression<span class="rm" style="color: #bf0303"><del>, or</del></span> <span class="addu">.</span></li>
1499+
it is an immediate invocation that <span class="addu">either</span> is
1500+
not a constant expression<span class="rm" style="color: #bf0303"><del>,</del></span> or <span class="addu">is an
1501+
immediate constant expression.</span></li>
15001502
<li><span class="marginalizedparent"><a class="marginalized" href="#pnum_67" id="pnum_67">(24.3)</a></span>
15011503
<span class="rm" style="color: #bf0303"><del>it is of consteval-only
15021504
type ([basic.types.general]).</del></span></li>

0 commit comments

Comments
 (0)