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

Propagate tag to SequenceStart event.

Browse source
This commit is contained in:
Ethiraric 2023-11-19 14:40:01 +01:00
parent e6fdcddceb
commit 3f10cf9e5d
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
saphyr/src/parser.rs
View file

@ -55,6 +55,8 @@ pub enum Event {
SequenceStart( SequenceStart(
/// The anchor ID of the start of the squence. /// The anchor ID of the start of the squence.
usize, usize,
/// An optional tag
Option<Tag>,
), ),
SequenceEnd, SequenceEnd,
MappingStart( MappingStart(
@ -347,7 +349,7 @@ impl<T: Iterator<Item = char>> Parser<T> {
recv.on_event(first_ev, mark); recv.on_event(first_ev, mark);
Ok(()) Ok(())
} }
Event::SequenceStart(_) => { Event::SequenceStart(..) => {
recv.on_event(first_ev, mark); recv.on_event(first_ev, mark);
self.load_sequence(recv) self.load_sequence(recv)
} }
@ -615,7 +617,7 @@ impl<T: Iterator<Item = char>> Parser<T> {
match *self.peek_token()? { match *self.peek_token()? {
Token(mark, TokenType::BlockEntry) if indentless_sequence => { Token(mark, TokenType::BlockEntry) if indentless_sequence => {
self.state = State::IndentlessSequenceEntry; self.state = State::IndentlessSequenceEntry;
Ok((Event::SequenceStart(anchor_id), mark)) Ok((Event::SequenceStart(anchor_id, tag), mark))
} }
Token(_, TokenType::Scalar(..)) => { Token(_, TokenType::Scalar(..)) => {
self.pop_state(); self.pop_state();
@ -627,7 +629,7 @@ impl<T: Iterator<Item = char>> Parser<T> {
} }
Token(mark, TokenType::FlowSequenceStart) => { Token(mark, TokenType::FlowSequenceStart) => {
self.state = State::FlowSequenceFirstEntry; self.state = State::FlowSequenceFirstEntry;
Ok((Event::SequenceStart(anchor_id), mark)) Ok((Event::SequenceStart(anchor_id, tag), mark))
} }
Token(mark, TokenType::FlowMappingStart) => { Token(mark, TokenType::FlowMappingStart) => {
self.state = State::FlowMappingFirstKey; self.state = State::FlowMappingFirstKey;
@ -635,7 +637,7 @@ impl<T: Iterator<Item = char>> Parser<T> {
} }
Token(mark, TokenType::BlockSequenceStart) if block => { Token(mark, TokenType::BlockSequenceStart) if block => {
self.state = State::BlockSequenceFirstEntry; self.state = State::BlockSequenceFirstEntry;
Ok((Event::SequenceStart(anchor_id), mark)) Ok((Event::SequenceStart(anchor_id, tag), mark))
} }
Token(mark, TokenType::BlockMappingStart) if block => { Token(mark, TokenType::BlockMappingStart) if block => {
self.state = State::BlockMappingFirstKey; self.state = State::BlockMappingFirstKey;

8
saphyr/src/yaml.rs
View file

@ -91,7 +91,7 @@ impl MarkedEventReceiver for YamlLoader {
_ => unreachable!(), _ => unreachable!(),
} }
} }
Event::SequenceStart(aid) => { Event::SequenceStart(aid, _) => {
self.doc_stack.push((Yaml::Array(Vec::new()), aid)); self.doc_stack.push((Yaml::Array(Vec::new()), aid));
} }
Event::SequenceEnd => { Event::SequenceEnd => {
@ -110,7 +110,11 @@ impl MarkedEventReceiver for YamlLoader {
Event::Scalar(v, style, aid, tag) => { Event::Scalar(v, style, aid, tag) => {
let node = if style != TScalarStyle::Plain { let node = if style != TScalarStyle::Plain {
Yaml::String(v) Yaml::String(v)
} else if let Some(Tag { ref handle, ref suffix }) = tag { } else if let Some(Tag {
ref handle,
ref suffix,
}) = tag
{
// XXX tag:yaml.org,2002: // XXX tag:yaml.org,2002:
if handle == "!!" { if handle == "!!" {
match suffix.as_ref() { match suffix.as_ref() {

11
saphyr/tests/yaml-test-suite.rs
View file

@ -4,7 +4,7 @@ use libtest_mimic::{run_tests, Arguments, Outcome, Test};
use yaml_rust::{ use yaml_rust::{
parser::{Event, EventReceiver, Parser, Tag}, parser::{Event, EventReceiver, Parser, Tag},
scanner::{TScalarStyle}, scanner::TScalarStyle,
yaml, ScanError, Yaml, YamlLoader, yaml, ScanError, Yaml, YamlLoader,
}; };
@ -145,7 +145,9 @@ impl EventReceiver for EventReporter {
Event::DocumentStart => "+DOC".into(), Event::DocumentStart => "+DOC".into(),
Event::DocumentEnd => "-DOC".into(), Event::DocumentEnd => "-DOC".into(),
Event::SequenceStart(idx) => format!("+SEQ{}", format_index(idx)), Event::SequenceStart(idx, tag) => {
format!("+SEQ{}{}", format_index(idx), format_tag(&tag))
}
Event::SequenceEnd => "-SEQ".into(), Event::SequenceEnd => "-SEQ".into(),
Event::MappingStart(idx, tag) => { Event::MappingStart(idx, tag) => {
@ -301,12 +303,7 @@ fn expected_events(expected_tree: &str) -> Vec<String> {
static EXPECTED_FAILURES: &[&str] = &[ static EXPECTED_FAILURES: &[&str] = &[
// These seem to be API limited (not enough information on the event stream level) // These seem to be API limited (not enough information on the event stream level)
// No tag available for SEQ and MAP // No tag available for SEQ and MAP
"35KP",
"57H4",
"6JWB",
"C4HZ", "C4HZ",
"EHF6",
"J7PZ",
// Cannot resolve tag namespaces // Cannot resolve tag namespaces
"5TYM", "5TYM",
"6CK3", "6CK3",