Skip to content

Allow comments w/ newlines before commas in arrays #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 30, 2020
Merged

Allow comments w/ newlines before commas in arrays #767

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a45869
Allow comments w/ newlines before commas in arrays
eksortso Aug 16, 2020
5d635d6
Comments w/ NLs before commas in arrays (toml.md)
eksortso Aug 16, 2020
2ff9c1e
Comments w/ NL before commas, etc. (CHANGELOG.md)
eksortso Aug 16, 2020
9c6aca6
Comments and newlines
eksortso Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## unreleased

Nothing.
* Clarify that comments with newlines are allowed before commas in arrays.

## 1.0.0-rc.2 / 2020-08-09

Expand Down
4 changes: 2 additions & 2 deletions toml.abnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ array = array-open [ array-values ] ws-comment-newline array-close
array-open = %x5B ; [
array-close = %x5D ; ]

array-values = ws-comment-newline val ws array-sep array-values
array-values =/ ws-comment-newline val ws [ array-sep ]
array-values = ws-comment-newline val ws-comment-newline array-sep array-values
array-values =/ ws-comment-newline val ws-comment-newline [ array-sep ]

array-sep = %x2C ; , Comma

Expand Down
4 changes: 2 additions & 2 deletions toml.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,8 @@ contributors = [
```

Arrays can span multiple lines. A terminating comma (also called trailing comma)
is ok after the last value of the array. There can be an arbitrary number of
newlines and comments before a value and before the closing bracket.
is permitted after the last value of the array. Any number of newlines and
comments may precede values, commas, and the closing bracket.

```toml
integers2 = [
Expand Down