Mirrors/libyaml-safer
2
0
Fork 0
mirror of https://github.com/simonask/libyaml-safer synced 2024-11-21 19:03:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix marks in tokens

Browse source
This commit is contained in:
Simon Ask Ulsnes 2024-02-11 09:22:27 +01:00
parent 82b38c2b47
commit 36e62f40b0
4 changed files with 203 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/event.rs
View file

@ -3,7 +3,7 @@ use crate::{
};
/// The event structure.
#[derive(Debug)]
#[derive(Debug, PartialEq)]
#[non_exhaustive]
pub struct Event {
/// The event data.
@ -14,7 +14,7 @@ pub struct Event {
pub end_mark: Mark,
}
#[derive(Debug)]
#[derive(Debug, PartialEq)]
pub enum EventData {
/// The stream parameters (for YAML_STREAM_START_EVENT).
StreamStart {

200
src/lib.rs
View file

@ -73,7 +73,7 @@ pub const DEFAULT_SEQUENCE_TAG: &str = SEQ_TAG;
pub const DEFAULT_MAPPING_TAG: &str = MAP_TAG;
/// The version directive data.
#[derive(Clone, Copy, Debug)]
#[derive(Clone, Copy, Debug, PartialEq)]
#[non_exhaustive]
pub struct VersionDirective {
/// The major version number.
@ -83,7 +83,7 @@ pub struct VersionDirective {
}
/// The tag directive data.
#[derive(Debug, Clone)]
#[derive(Debug, Clone, PartialEq)]
#[non_exhaustive]
pub struct TagDirective {
/// The tag handle.
@ -200,4 +200,200 @@ tie-fighter: '|\-*-/|'
let output_str = core::str::from_utf8(&output).expect("invalid UTF-8");
assert_eq!(output_str, SANITY_OUTPUT);
}
#[test]
fn scanner_marks() {
const INPUT: &str = "b:
c: true";
let mut scanner = Scanner::new();
let mut read_in = INPUT.as_bytes();
scanner.set_input(&mut read_in);
let events = scanner.collect::<Result<Vec<_>, _>>().unwrap();
let expected = &[
Token {
data: TokenData::StreamStart {
encoding: Encoding::Utf8,
},
start_mark: Mark {
index: 0,
line: 0,
column: 0,
},
end_mark: Mark {
index: 0,
line: 0,
column: 0,
},
},
Token {
data: TokenData::BlockMappingStart,
start_mark: Mark {
index: 0,
line: 0,
column: 0,
},
end_mark: Mark {
index: 0,
line: 0,
column: 0,
},
},
Token {
data: TokenData::Key,
start_mark: Mark {
index: 0,
line: 0,
column: 0,
},
end_mark: Mark {
index: 0,
line: 0,
column: 0,
},
},
Token {
data: TokenData::Scalar {
value: String::from("b"),
style: ScalarStyle::Plain,
},
start_mark: Mark {
index: 0,
line: 0,
column: 0,
},
end_mark: Mark {
index: 1,
line: 0,
column: 1,
},
},
Token {
data: TokenData::Value,
start_mark: Mark {
index: 1,
line: 0,
column: 1,
},
end_mark: Mark {
index: 2,
line: 0,
column: 2,
},
},
Token {
data: TokenData::Key,
start_mark: Mark {
index: 3,
line: 1,
column: 0,
},
end_mark: Mark {
index: 3,
line: 1,
column: 0,
},
},
Token {
data: TokenData::Scalar {
value: String::from("c"),
style: ScalarStyle::Plain,
},
start_mark: Mark {
index: 3,
line: 1,
column: 0,
},
end_mark: Mark {
index: 4,
line: 1,
column: 1,
},
},
Token {
data: TokenData::Value,
start_mark: Mark {
index: 4,
line: 1,
column: 1,
},
end_mark: Mark {
index: 5,
line: 1,
column: 2,
},
},
Token {
data: TokenData::Scalar {
value: String::from("true"),
style: ScalarStyle::Plain,
},
start_mark: Mark {
index: 6,
line: 1,
column: 3,
},
end_mark: Mark {
index: 10,
line: 1,
column: 7,
},
},
Token {
data: TokenData::BlockEnd,
start_mark: Mark {
index: 10,
line: 2,
column: 0,
},
end_mark: Mark {
index: 10,
line: 2,
column: 0,
},
},
Token {
data: TokenData::StreamEnd,
start_mark: Mark {
index: 10,
line: 2,
column: 0,
},
end_mark: Mark {
index: 10,
line: 2,
column: 0,
},
},
];
assert_eq!(
events,
expected,
"diff:\n{}",
zip_longest(
format!("{events:#?}").lines(),
format!("{expected:#?}").lines()
)
.map(|(a, b)| {
let a = a.unwrap_or_default();
let b = b.unwrap_or_default();
format!("{a:<40} {b}")
})
.collect::<Vec<_>>()
.join("\n")
);
}
fn zip_longest<A: Iterator, B: Iterator>(
a: A,
b: B,
) -> impl Iterator<Item = (Option<A::Item>, Option<B::Item>)> {
let mut a = a.map(Some).collect::<Vec<_>>();
let mut b = b.map(Some).collect::<Vec<_>>();
let len = a.len().max(b.len());
a.resize_with(len, || None);
b.resize_with(len, || None);
a.into_iter()
.zip(b)
.take_while(|(a, b)| a.is_some() || b.is_some())
}
}

2
src/scanner.rs
View file

@ -129,7 +129,7 @@ impl<'r> Scanner<'r> {
fn read_char(&mut self, string: &mut String) {
if let Some(popped) = self.buffer.pop_front() {
string.push(popped);
self.mark.index = popped.len_utf8() as u64;
self.mark.index += popped.len_utf8() as u64;
self.mark.column += 1;
} else {
panic!("unexpected end of input")

2
src/token.rs
View file

@ -1,6 +1,7 @@
use crate::{Encoding, Mark, ScalarStyle};
/// The token structure.
#[derive(Debug, PartialEq)]
#[non_exhaustive]
pub struct Token {
/// The token type.
@ -11,6 +12,7 @@ pub struct Token {
pub end_mark: Mark,
}
#[derive(Debug, PartialEq)]
pub enum TokenData {
/// A STREAM-START token.
StreamStart {