diff --git a/draft-marchan-kdl2.md b/draft-marchan-kdl2.md index e65240f..865d13a 100644 --- 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 new file mode 100644 index 0000000..8ab5eac --- /dev/null +++ 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 new file mode 100644 index 0000000..0bdec0e --- /dev/null +++ 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 new file mode 100644 index 0000000..98f41e3 --- /dev/null +++ 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 new file mode 100644 index 0000000..0bdec0e --- /dev/null +++ b/tests/test_cases/expected_kdl/zero_space_before_slashdash_prop.kdl @@ -0,0 +1 @@ +node string diff --git a/tests/test_cases/input/braces_in_bare_id_fail.kdl b/tests/test_cases/input/braces_in_bare_id.kdl similarity index 100% rename from tests/test_cases/input/braces_in_bare_id_fail.kdl rename to tests/test_cases/input/braces_in_bare_id.kdl diff --git a/tests/test_cases/input/zero_space_before_slashdash_arg_fail.kdl b/tests/test_cases/input/zero_space_before_slashdash_arg.kdl similarity index 100% rename from tests/test_cases/input/zero_space_before_slashdash_arg_fail.kdl rename to tests/test_cases/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 new file mode 100644 index 0000000..6139537 --- /dev/null +++ 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 new file mode 100644 index 0000000..08fed03 --- /dev/null +++ b/tests/test_cases/input/zero_space_before_slashdash_prop.kdl @@ -0,0 +1 @@ +node "string"/-foo=1