From e08d1f7f3617fd2ed5228aa30e842c2247e41521 Mon Sep 17 00:00:00 2001 From: Alessandro Coglio Date: Wed, 21 Apr 2021 10:39:37 -0700 Subject: [PATCH 1/2] [ABNF] Move two rules and add some comments. This does not change the grammar, just its presentation in the file. --- grammar/abnf-grammar.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/grammar/abnf-grammar.txt b/grammar/abnf-grammar.txt index b7aaf08b07..ec983aef9a 100644 --- a/grammar/abnf-grammar.txt +++ b/grammar/abnf-grammar.txt @@ -338,7 +338,14 @@ not-star = %x0-29 / %x2B-10FFFF ; anything but * not-line-feed-or-carriage-return = %x0-9 / %xB-C / %xE-10FFFF ; anything but LF or CR -not-star-or-slash = %x0-29 / %x2B-2E / %x30-10FFFF ; anything but * or / +not-double-quote-or-open-brace = %x0-22 / %x24-7A / %x7C-10FFFF + ; anything but " or { + +not-double-quote-or-close-brace = %x0-22 / %x24-7C / %x7E-10FFFF + ; anything but " or } + +not-star-or-slash = %x0-29 / %x2B-2E / %x30-10FFFF + ; anything but * or / ; Lines in Leo may be terminated via ; a single carriage return, @@ -447,10 +454,6 @@ package-name = 1*( lowercase-letter / digit ) format-string-container = "{}" -not-double-quote-or-open-brace = %x0-22 / %x24-7A / %x7C-10FFFF - -not-double-quote-or-close-brace = %x0-22 / %x24-7C / %x7E-10FFFF - format-string-element = not-double-quote-or-open-brace / "{" not-double-quote-or-close-brace / format-string-container From ac5ca5058a36aba0e3d66147f808c5f11500fac9 Mon Sep 17 00:00:00 2001 From: Alessandro Coglio Date: Wed, 21 Apr 2021 10:44:40 -0700 Subject: [PATCH 2/2] [ABNF] Edit some doc comments for consistency. No change to the grammar, just some edits in comments. --- grammar/abnf-grammar.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/grammar/abnf-grammar.txt b/grammar/abnf-grammar.txt index ec983aef9a..b986c6bef7 100644 --- a/grammar/abnf-grammar.txt +++ b/grammar/abnf-grammar.txt @@ -336,7 +336,7 @@ not-double-quote = %x0-22 / %x24-10FFFF ; anything but " not-star = %x0-29 / %x2B-10FFFF ; anything but * not-line-feed-or-carriage-return = %x0-9 / %xB-C / %xE-10FFFF - ; anything but LF or CR + ; anything but or not-double-quote-or-open-brace = %x0-22 / %x24-7A / %x7C-10FFFF ; anything but " or { @@ -999,16 +999,17 @@ file = *declaration ; Format Note ; ----------- -; The ABNF standard requires grammars to consist of lines terminated by CR LF +; The ABNF standard requires grammars to consist of lines terminated by ; (i.e. carriage return followed by line feed, DOS/Windows-style), ; as explained in the background on ABNF earlier in this file. -; This file's lines are therefore terminated by CR LF. +; This file's lines are therefore terminated by . ; To avoid losing this requirement across systems, ; this file is marked as 'text eol=crlf' in .gitattributes: ; this means that the file is textual, enabling visual diffs, -; but its lines will always be terminated by CR LF on any system. +; but its lines will always be terminated by on any system. -; Note that this CR LF requirement only applies to the grammar files themselves. +; Note that this requirement only applies +; to the grammar files themselves. ; It does not apply to the lines of the languages described by the grammar. ; ABNF grammars may describe any kind of languages, ; with any kind of line terminators,