Remove mandatory node-space before slashdash and children block (#499)

* Remove mandatory node-space before slashdash Fix #495 * Add tests * Fix more tests * Fix tests again
kdl-org · Jan 29, 2025 · 84911fe · 84911fe
1 parent c54ebd9
commit 84911fe
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 4 deletions.
diff --git a/draft-marchan-kdl2.md b/draft-marchan-kdl2.md
@@ -936,11 +936,11 @@ document := bom? version? nodes
 nodes := (line-space* node)* line-space*
 
 base-node := slashdash? type? node-space* string
-    (node-space+ slashdash? node-prop-or-arg)*
+    (node-space* (node-space | slashdash) node-prop-or-arg)*
     // slashdashed node-children must always be after props and args.
-    (node-space+ slashdash node-children)*
-    (node-space+ node-children)?
-    (node-space+ slashdash node-children)*
+    (node-space* slashdash node-children)*
+    (node-space* node-children)?
+    (node-space* slashdash node-children)*
     node-space*
 node := base-node node-terminator
 final-node := base-node node-terminator?

diff --git a/tests/test_cases/expected_kdl/braces_in_bare_id.kdl b/tests/test_cases/expected_kdl/braces_in_bare_id.kdl
@@ -0,0 +1,3 @@
+foo123 {
+    bar
+}
diff --git a/tests/test_cases/expected_kdl/zero_space_before_slashdash_arg.kdl b/tests/test_cases/expected_kdl/zero_space_before_slashdash_arg.kdl
@@ -0,0 +1 @@
+node string
diff --git a/tests/test_cases/expected_kdl/zero_space_before_slashdash_children.kdl b/tests/test_cases/expected_kdl/zero_space_before_slashdash_children.kdl
@@ -0,0 +1,2 @@
+node string
+node string
diff --git a/tests/test_cases/expected_kdl/zero_space_before_slashdash_prop.kdl b/tests/test_cases/expected_kdl/zero_space_before_slashdash_prop.kdl
@@ -0,0 +1 @@
+node string
diff --git a/...st_cases/input/braces_in_bare_id_fail.kdl → tests/test_cases/input/braces_in_bare_id.kdl b/...st_cases/input/braces_in_bare_id_fail.kdl → tests/test_cases/input/braces_in_bare_id.kdl
diff --git a/.../zero_space_before_slashdash_arg_fail.kdl → ...input/zero_space_before_slashdash_arg.kdl b/.../zero_space_before_slashdash_arg_fail.kdl → ...input/zero_space_before_slashdash_arg.kdl
diff --git a/tests/test_cases/input/zero_space_before_slashdash_children.kdl b/tests/test_cases/input/zero_space_before_slashdash_children.kdl
@@ -0,0 +1,2 @@
+node "string"/-{}
+node "string" {}/-{}
diff --git a/tests/test_cases/input/zero_space_before_slashdash_prop.kdl b/tests/test_cases/input/zero_space_before_slashdash_prop.kdl
@@ -0,0 +1 @@
+node "string"/-foo=1