From 0611ddd94fa6bdeedbac1b458e72197ae5756b2c Mon Sep 17 00:00:00 2001 From: Eric McCarthy Date: Tue, 19 Apr 2022 13:34:56 -0700 Subject: [PATCH] [ABNF] fix merge of #1759 --- docs/grammar/README.md | 18 +++++++++--------- docs/grammar/abnf-grammar.txt | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/grammar/README.md b/docs/grammar/README.md index e4d45cd529..139244684d 100644 --- a/docs/grammar/README.md +++ b/docs/grammar/README.md @@ -267,15 +267,6 @@ signed-literal = numeral ( %s"i8" / %s"i16" / %s"i32" / %s"i64" / %s"i128" ) Go to: _[numeral](#user-content-numeral)_; - -```abnf -integer-literal = unsigned-literal - / signed-literal -``` - -Go to: _[signed-literal](#user-content-signed-literal), [unsigned-literal](#user-content-unsigned-literal)_; - - ```abnf field-literal = numeral %s"field" @@ -408,6 +399,15 @@ string-literal-element = not-double-quote-or-backslash Go to: _[ascii-character-escape](#user-content-ascii-character-escape), [not-double-quote-or-backslash](#user-content-not-double-quote-or-backslash), [simple-character-escape](#user-content-simple-character-escape), [unicode-character-escape](#user-content-unicode-character-escape)_; + +```abnf +integer-literal = unsigned-literal + / signed-literal +``` + +Go to: _[signed-literal](#user-content-signed-literal), [unsigned-literal](#user-content-unsigned-literal)_; + + ```abnf numeric-literal = integer-literal diff --git a/docs/grammar/abnf-grammar.txt b/docs/grammar/abnf-grammar.txt index 07f870ff14..92f899f3a5 100644 --- a/docs/grammar/abnf-grammar.txt +++ b/docs/grammar/abnf-grammar.txt @@ -118,9 +118,6 @@ unsigned-literal = numeral ( %s"u8" / %s"u16" / %s"u32" / %s"u64" / %s"u128" ) signed-literal = numeral ( %s"i8" / %s"i16" / %s"i32" / %s"i64" / %s"i128" ) -integer-literal = unsigned-literal - / signed-literal - field-literal = numeral %s"field" product-group-literal = numeral %s"group" @@ -169,6 +166,9 @@ string-literal-element = not-double-quote-or-backslash / ascii-character-escape / unicode-character-escape +integer-literal = unsigned-literal + / signed-literal + numeric-literal = integer-literal / field-literal / product-group-literal