Make line-space a superset of node-space (#440)

* Allow escline everywhere * escline tests
kdl-org · Dec 17, 2024 · 23918bd · 23918bd
1 parent 6906771
commit 23918bd
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 2 deletions.
diff --git a/SPEC.md b/SPEC.md
@@ -910,14 +910,14 @@ unicode-space := See Table (All White_Space unicode characters which are not `ne
 single-line-comment := '//' ^newline* (newline | eof)
 multi-line-comment := '/*' commented-block
 commented-block := '*/' | (multi-line-comment | '*' | '/' | [^*/]+) commented-block
-slashdash := '/-' (node-space | line-space)*
+slashdash := '/-' line-space*
 
 // Whitespace
 ws := unicode-space | multi-line-comment
 escline := '\\' ws* (single-line-comment | newline | eof)
 newline := See Table (All Newline White_Space)
 // Whitespace where newlines are allowed.
-line-space := newline | ws | single-line-comment
+line-space := node-space | newline | single-line-comment
 // Whitespace within nodes, where newline-ish things must be esclined.
 node-space := ws* escline ws* | ws+
 ```

diff --git a/tests/test_cases/expected_kdl/escline_after_semicolon.kdl b/tests/test_cases/expected_kdl/escline_after_semicolon.kdl
@@ -0,0 +1,2 @@
+node
+node
diff --git a/tests/test_cases/expected_kdl/escline_empty_line.kdl b/tests/test_cases/expected_kdl/escline_empty_line.kdl
@@ -0,0 +1 @@
+node
diff --git a/tests/test_cases/expected_kdl/escline_in_child_block.kdl b/tests/test_cases/expected_kdl/escline_in_child_block.kdl
@@ -0,0 +1,4 @@
+parent {
+    child
+    child
+}
diff --git a/tests/test_cases/expected_kdl/escline_node_type.kdl b/tests/test_cases/expected_kdl/escline_node_type.kdl
@@ -0,0 +1 @@
+(type)node
diff --git a/tests/test_cases/expected_kdl/escline_slashdash.kdl b/tests/test_cases/expected_kdl/escline_slashdash.kdl
@@ -0,0 +1 @@
+node
diff --git a/tests/test_cases/input/escline_after_semicolon.kdl b/tests/test_cases/input/escline_after_semicolon.kdl
@@ -0,0 +1,2 @@
+node; \
+node
diff --git a/tests/test_cases/input/escline_empty_line.kdl b/tests/test_cases/input/escline_empty_line.kdl
@@ -0,0 +1,3 @@
+\
+
+node
diff --git a/tests/test_cases/input/escline_in_child_block.kdl b/tests/test_cases/input/escline_in_child_block.kdl
@@ -0,0 +1,5 @@
+parent {
+    child
+    \ // comment
+    child
+}
diff --git a/tests/test_cases/input/escline_node_type.kdl b/tests/test_cases/input/escline_node_type.kdl
@@ -0,0 +1,2 @@
+\
+(type)node
diff --git a/tests/test_cases/input/escline_slashdash.kdl b/tests/test_cases/input/escline_slashdash.kdl
@@ -0,0 +1,4 @@
+node
+\
+/-
+node
-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    node
+    \
+    /-
+    node