Allow node-space after slashdash and add a bunch more slashdash tests (#427)

zkat · web-flow · commit 171bc71f4236 · 2024-12-10T20:43:58.000-08:00
Fixes: #426
diff --git a/SPEC.md b/SPEC.md
@@ -905,7 +905,7 @@ 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 := '/-' line-space*
+slashdash := '/-' (node-space | line-space)*
 
 // Whitespace
 ws := unicode-space | multi-line-comment
diff --git a/tests/test_cases/expected_kdl/slashdash_escline_before_arg_type.kdl b/tests/test_cases/expected_kdl/slashdash_escline_before_arg_type.kdl
@@ -0,0 +1 @@
+node arg2
diff --git a/tests/test_cases/expected_kdl/slashdash_escline_before_children.kdl b/tests/test_cases/expected_kdl/slashdash_escline_before_children.kdl
@@ -0,0 +1 @@
+node arg1
diff --git a/tests/test_cases/expected_kdl/slashdash_escline_before_node.kdl b/tests/test_cases/expected_kdl/slashdash_escline_before_node.kdl
@@ -0,0 +1 @@
+node2
diff --git a/tests/test_cases/expected_kdl/slashdash_false_node.kdl b/tests/test_cases/expected_kdl/slashdash_false_node.kdl
@@ -0,0 +1 @@
+node foo bar
diff --git a/tests/test_cases/input/slashdash_after_arg_type_fail.kdl b/tests/test_cases/input/slashdash_after_arg_type_fail.kdl
@@ -0,0 +1 @@
+node (ty)/-arg1 arg2
diff --git a/tests/test_cases/input/slashdash_after_node_type_fail.kdl b/tests/test_cases/input/slashdash_after_node_type_fail.kdl
@@ -0,0 +1,2 @@
+(ty)/-node
+other-node
diff --git a/tests/test_cases/input/slashdash_after_prop_key_fail.kdl b/tests/test_cases/input/slashdash_after_prop_key_fail.kdl
diff --git a/tests/test_cases/input/slashdash_after_prop_val_type_fail.kdl b/tests/test_cases/input/slashdash_after_prop_val_type_fail.kdl
@@ -0,0 +1 @@
+node key=(ty)/-val other-arg
diff --git a/tests/test_cases/input/slashdash_before_children_end_fail.kdl b/tests/test_cases/input/slashdash_before_children_end_fail.kdl
@@ -0,0 +1,4 @@
+node {
+    child1
+    /-
+}
diff --git a/tests/test_cases/input/slashdash_before_eof_fail.kdl b/tests/test_cases/input/slashdash_before_eof_fail.kdl
@@ -0,0 +1 @@
+node foo /-
diff --git a/tests/test_cases/input/slashdash_before_prop_value_fail.kdl b/tests/test_cases/input/slashdash_before_prop_value_fail.kdl
@@ -0,0 +1 @@
+node key = /-val etc
diff --git a/tests/test_cases/input/slashdash_before_semicolon_fail.kdl b/tests/test_cases/input/slashdash_before_semicolon_fail.kdl
@@ -0,0 +1 @@
+node foo /-;
diff --git a/tests/test_cases/input/slashdash_escline_before_arg_type.kdl b/tests/test_cases/input/slashdash_escline_before_arg_type.kdl
@@ -0,0 +1,2 @@
+node /-\
+(ty)arg1 arg2
diff --git a/tests/test_cases/input/slashdash_escline_before_children.kdl b/tests/test_cases/input/slashdash_escline_before_children.kdl
@@ -0,0 +1,3 @@
+node arg1 /-\
+{
+}
diff --git a/tests/test_cases/input/slashdash_escline_before_node.kdl b/tests/test_cases/input/slashdash_escline_before_node.kdl
@@ -0,0 +1,3 @@
+/-\
+node1
+node2
diff --git a/tests/test_cases/input/slashdash_false_node.kdl b/tests/test_cases/input/slashdash_false_node.kdl
@@ -0,0 +1,2 @@
+node foo /-
+not-a-node bar
diff --git a/tests/test_cases/input/slashdash_inside_arg_type_fail.kdl b/tests/test_cases/input/slashdash_inside_arg_type_fail.kdl
@@ -0,0 +1 @@
+node (/-bad)nope
diff --git a/tests/test_cases/input/slashdash_inside_node_type_fail.kdl b/tests/test_cases/input/slashdash_inside_node_type_fail.kdl
@@ -0,0 +1 @@
+(/-ty)node

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +node {
 +    child1
 +    /-
 +}