From bc01380fee1901f46986a57ec7338434109d214b Mon Sep 17 00:00:00 2001 From: gluax <16431709+gluax@users.noreply.github.com> Date: Wed, 2 Feb 2022 11:23:05 -0800 Subject: [PATCH] merge upstream chagnes from staging --- grammar/README.md | 6 ++---- grammar/abnf-grammar.txt | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/grammar/README.md b/grammar/README.md index afa7e79d9e..557f748a55 100644 --- a/grammar/README.md +++ b/grammar/README.md @@ -1456,12 +1456,10 @@ Finally we have conditional expressions. ```abnf conditional-expression = disjunctive-expression - / disjunctive-expression - "?" expression - ":" conditional-expression + / disjunctive-expression "?" expression ":" 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. diff --git a/grammar/abnf-grammar.txt b/grammar/abnf-grammar.txt index aa480e2b7d..dcb7cdc51c 100644 --- a/grammar/abnf-grammar.txt +++ b/grammar/abnf-grammar.txt @@ -890,9 +890,7 @@ disjunctive-expression = conjunctive-expression ; Finally we have conditional expressions. conditional-expression = disjunctive-expression - / disjunctive-expression - "?" expression - ":" conditional-expression + / disjunctive-expression "?" expression ":" expression ; Those above are all the expressions. ; Recall that conditional expressions