arcayr/saphyr-serde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix use of dashes in flow contexts.

Browse source
This commit is contained in:
Ethiraric 2024-01-19 21:57:39 +01:00
parent c60099af9b
commit ef799af5eb
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
parser/src/scanner.rs
View file

@ -2030,6 +2030,7 @@ impl<T: Iterator<Item = char>> Scanner<T> {
Ok(())
}
#[allow(clippy::too_many_lines)]
fn scan_plain_scalar(&mut self) -> Result<Token, ScanError> {
self.unroll_non_block_indents();
let indent = self.indent + 1;
@ -2044,7 +2045,6 @@ impl<T: Iterator<Item = char>> Scanner<T> {
loop {
/* Check for a document indicator. */
self.lookahead(4);
if self.mark.col == 0
&& (((self.buffer[0] == '-') && (self.buffer[1] == '-') && (self.buffer[2] == '-'))
|| ((self.buffer[0] == '.')
@ -2058,6 +2058,14 @@ impl<T: Iterator<Item = char>> Scanner<T> {
if self.ch() == '#' {
break;
}
if self.flow_level > 0 && self.ch() == '-' && is_flow(self.buffer[1]) {
return Err(ScanError::new(
self.mark,
"plain scalar cannot start with '-' followed by ,[]{}",
));
}
while !is_blankz(self.ch()) {
// indicators can end a plain scalar, see 7.3.3. Plain Style
match self.ch() {
@ -2066,7 +2074,7 @@ impl<T: Iterator<Item = char>> Scanner<T> {
{
break;
}
',' | '[' | ']' | '{' | '}' if self.flow_level > 0 => break,
c if is_flow(c) && self.flow_level > 0 => break,
_ => {}
}

3
parser/tests/yaml-test-suite.rs
View file

@ -297,9 +297,6 @@ fn expected_events(expected_tree: &str) -> Vec<String> {
#[rustfmt::skip]
static EXPECTED_FAILURES: &[&str] = &[
// Dashes in flow sequence (should be forbidden)
"G5U8",
"YJV2",
// Misc
"9MMW", // Mapping key in implicit mapping in flow sequence(!)
"G9HC", // Anchor indent problem(?)