Skip to content
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

Subsume comments in newline #333

Closed
wants to merge 1 commit into from
Closed

Subsume comments in newline #333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 13 additions & 15 deletions toml.abnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,17 @@

;; TOML

toml = expression *( newline expression )
expression = (
ws /
ws comment /
ws keyval ws [ comment ] /
ws table ws [ comment ]
)
toml = ews expression *( newlines ws expression ) ews [ comment ]
expression = keyval / table

;; Newline

newline = (
nl = (
%x0A / ; LF
%x0D.0A ; CRLF
)

newline = ws [ comment ] nl
newlines = 1*newline

;; Whitespace
Expand All @@ -27,6 +23,9 @@ ws = *(
%x09 ; Horizontal tab
)

;; Extended whitespace, this is where newlines are not significant
ews = [ newlines ] ws

;; Comment

comment-start-symbol = %x23 ; #
Expand Down Expand Up @@ -111,7 +110,7 @@ escape = %x5C ; \

ml-basic-string-delim = quotation-mark quotation-mark quotation-mark
ml-basic-string = ml-basic-string-delim ml-basic-body ml-basic-string-delim
ml-basic-body = *( ml-basic-char / newline / ( escape newline ))
ml-basic-body = *( ml-basic-char / nl / ( escape nl ))

ml-basic-char = ml-basic-unescaped / escaped
ml-basic-unescaped = %x20-5B / %x5D-10FFFF
Expand All @@ -129,7 +128,7 @@ literal-char = %x09 / %x20-26 / %x28-10FFFF
ml-literal-string-delim = apostraphe apostraphe apostraphe
ml-literal-string = ml-literal-string-delim ml-literal-body ml-literal-string-delim

ml-literal-body = *( ml-literal-char / newline )
ml-literal-body = *( ml-literal-char / nl )
ml-literal-char = %x09 / %x20-10FFFF

;; Boolean
Expand Down Expand Up @@ -158,15 +157,14 @@ date-time = full-date "T" full-time

;; Array

array-open = %x5B ws ; [
array-close = ws %x5D ; ]
array-open = %x5B ews ; [
array-close = ews %x5D ; ]

array = array-open array-values array-close

array-values = [ val [ array-sep ] [ ( comment newlines) / newlines ] /
val array-sep [ ( comment newlines) / newlines ] array-values ]
array-values = [ val / val array-sep array-values ]

array-sep = ws %x2C ws ; , Comma
array-sep = ews %x2C ews ; , Comma

;; Inline Table

Expand Down