Permit more control characters in comments (toml-lang#924)

Co-authored-by: Taneli Hukkinen <[email protected]> Co-authored-by: Pradyun Gedam <[email protected]>
arp242 · Jan 10, 2023 · ab74958 · ab74958
1 parent 913ff56
commit ab74958
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## unreleased
 
+- Relax comment parsing; most control characters are again permitted.
 - Allow newline after key/values in inline tables.
 - Allow trailing comma in inline tables.
 - Clarify where and how dotted keys define tables.

diff --git a/toml.abnf b/toml.abnf
@@ -37,11 +37,10 @@ newline =/ %x0D.0A  ; CRLF
 
 ;; Comment
 
+comment = comment-start-symbol *allowed-comment-char
 comment-start-symbol = %x23 ; #
+allowed-comment-char = %x01-09 / %x0E-7F / non-ascii
 non-ascii = %x80-D7FF / %xE000-10FFFF
-non-eol = %x09 / %x20-7E / non-ascii
-
-comment = comment-start-symbol *non-eol
 
 ;; Key-Value pairs
 

diff --git a/toml.md b/toml.md
@@ -52,8 +52,9 @@ key = "value"  # This is a comment at the end of a line
 another = "# This is not a comment"
 ```
 
-Control characters other than tab (U+0000 to U+0008, U+000A to U+001F, U+007F)
-are not permitted in comments.
+Comments may contain any Unicode code points except the following control codes
+that could cause problems during editing or processing: U+0000, and U+000A to
+U+000D.
 
 ## Key/Value Pair