berkus
/
kdl
mirror of https://github.com/kdl-org/kdl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tighten up slashdash definition 

Previously slashdash was allowed anywhere `ws` was, and could be
followed by any legal slashdashable token regardless of position. This
caused some ambiguous parsing and enabled constructions we really don't
want.

The new version simply allows a slashdash to preceed each commentable
token, thus restricting its use to locations where the token is
otherwise valid.
This commit is contained in:
Lily Ballard 2020-12-15 21:54:51 -08:00 committed by GitHub
parent 3c36d683ab
commit d6ccb65d40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SPEC.md
View File

@ -152,9 +152,9 @@ Note that for the purpose of new lines, CRLF is considered _a single newline_.
nodes := linespace* (node (newline nodes)? linespace*)? nodes := linespace* (node (newline nodes)? linespace*)?
// FIXME: This is missing the newline at the end? And is the single-line-comment thing correct? // FIXME: This is missing the newline at the end? And is the single-line-comment thing correct?
node := identifier (node-space node-argument)* (node-space node-document)? single-line-comment? node := '/-'? identifier (node-space node-argument)* (node-space node-document)? single-line-comment?
node-argument := prop | value node-argument := '/-'? prop | value
node-children := '{' nodes '}' node-children := '/-'? '{' nodes '}'
node-space := ws* escline ws* | ws+ node-space := ws* escline ws* | ws+
// FIXME: This needs adjustment to the new, unicode-friendly version // FIXME: This needs adjustment to the new, unicode-friendly version
@ -190,11 +190,10 @@ linespace := newline | ws | single-line-comment
newline := `000D` | `000A` | `000D` `000A` | `0085` | `000C` | `2028` | `2029` newline := `000D` | `000A` | `000D` `000A` | `0085` | `000C` | `2028` | `2029`
ws := bom | unicode-space | multi-line-comment | slashdash-comment ws := bom | unicode-space | multi-line-comment
unicode-space := See Table (All White_Space unicode characters which are not `newline`) unicode-space := See Table (All White_Space unicode characters which are not `newline`)
single-line-comment := '//' ('\r' [^\n] | [^\r\n])* newline single-line-comment := '//' ('\r' [^\n] | [^\r\n])* newline
multi-line-comment := '/*' ('*' [^\/] | [^*])* '*/' multi-line-comment := '/*' ('*' [^\/] | [^*])* '*/'
slashdash-comment := '/-' (node | value | prop | node-children)
``` ```