merge upstream chagnes from staging

This commit is contained in:
gluax 2022-02-02 11:23:05 -08:00
parent 6cd6082100
commit bc01380fee
2 changed files with 3 additions and 7 deletions

View File

@ -1456,12 +1456,10 @@ Finally we have conditional expressions.
<a name="conditional-expression"></a> <a name="conditional-expression"></a>
```abnf ```abnf
conditional-expression = disjunctive-expression conditional-expression = disjunctive-expression
/ disjunctive-expression / disjunctive-expression "?" expression ":" expression
"?" expression
":" conditional-expression
``` ```
Go to: _[conditional-expression](#user-content-conditional-expression), [disjunctive-expression](#user-content-disjunctive-expression), [expression](#user-content-expression)_; Go to: _[disjunctive-expression](#user-content-disjunctive-expression), [expression](#user-content-expression)_;
Those above are all the expressions. Those above are all the expressions.

View File

@ -890,9 +890,7 @@ disjunctive-expression = conjunctive-expression
; Finally we have conditional expressions. ; Finally we have conditional expressions.
conditional-expression = disjunctive-expression conditional-expression = disjunctive-expression
/ disjunctive-expression / disjunctive-expression "?" expression ":" expression
"?" expression
":" conditional-expression
; Those above are all the expressions. ; Those above are all the expressions.
; Recall that conditional expressions ; Recall that conditional expressions