Skip to content

Commit

Permalink
merde_yaml: respect StreamEnd
Browse files Browse the repository at this point in the history
  • Loading branch information
@fasterthanlime
fasterthanlime committed Oct 1, 2024
1 parent eeed4cf commit a6431c7
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 78 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions merde/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
#[cfg(feature = "json")]
pub use merde_json as json;

#[cfg(feature = "yaml")]
pub use merde_yaml as yaml;

#[cfg(feature = "json")]
#[allow(unused_imports)]
use json::JsonSerialize;
Expand Down
177 changes: 100 additions & 77 deletions merde_yaml/src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
#![deny(missing_docs)]
#![doc = include_str!("../README.md")]

use std::str::Chars;

use merde_core::{ArrayStart, Deserializer, Event};
use yaml_rust2::{parser::Parser, scanner::TScalarStyle, ScanError};

/// A YAML deserializer, that implements [`merde_core::Deserializer`].
pub struct YamlDeserializer<'s> {
source: &'s str,
parser: Parser<Chars<'s>>,
Expand All @@ -17,11 +21,23 @@ impl std::fmt::Debug for YamlDeserializer<'_> {
}
}

/// Unifies [`merde_core::MerdeError`], [`yaml_rust2::ScanError`], and our own parsing errors.
#[derive(Debug)]
pub enum MerdeYamlError<'s> {
/// Most likely an error encountered when "destructuring" the JSON data.
MerdeError(merde_core::MerdeError<'s>),

/// Most likely a YAML syntax error
ScanError(ScanError),
ParseError { expected_type: &'static str },

/// For now, a type mismatch
ParseError {
/// the type we expected
expected_type: &'static str,
},

/// EOF encountered while expecting a value
Eof,
}

impl<'s> From<merde_core::MerdeError<'s>> for MerdeYamlError<'s> {
Expand All @@ -37,6 +53,7 @@ impl<'s> From<ScanError> for MerdeYamlError<'s> {
}

impl<'s> YamlDeserializer<'s> {
/// Construct a new YAML deserializer
pub fn new(source: &'s str) -> Self {
Self {
source,
Expand All @@ -50,87 +67,93 @@ impl<'s> Deserializer<'s> for YamlDeserializer<'s> {
type Error<'es> = MerdeYamlError<'es>;

fn next(&mut self) -> Result<Event<'s>, Self::Error<'s>> {
if let Some(starter) = self.starter.take() {
return Ok(starter);
}

let (ev, _marker) = match self.parser.next_token() {
Ok(ev) => ev,
Err(e) => {
// TODO: add location info, etc.
return Err(e.into());
loop {
if let Some(starter) = self.starter.take() {
return Ok(starter);
}
};

use yaml_rust2::Event as YEvent;

match ev {
YEvent::Nothing
| YEvent::StreamStart
| YEvent::StreamEnd
| YEvent::DocumentStart
| YEvent::DocumentEnd => {
// ignore those
return self.next();
}
YEvent::Alias(_) => {
todo!("aliases?")
}
YEvent::Scalar(s, style, _anchor_id, tag) => {
if style != TScalarStyle::Plain {
Ok(Event::Str(s.into()))
} else if let Some(tag) = tag {
if tag.handle == "tag:yaml.org,2002:" {
// TODO: use faster int/float parsers
match tag.suffix.as_ref() {
"bool" => match s.parse::<bool>() {
Ok(v) => Ok(Event::Bool(v)),
Err(_) => Err(MerdeYamlError::ParseError {
expected_type: "bool",
}),
},
"int" => match s.parse::<i64>() {
Ok(v) => Ok(Event::Int(v)),
Err(_) => Err(MerdeYamlError::ParseError {
expected_type: "int",
}),
},
"float" => match s.parse::<f64>() {
Ok(v) => Ok(Event::Float(v)),
Err(_) => Err(MerdeYamlError::ParseError {
expected_type: "float",
}),
},
"null" => match s.as_ref() {
"~" | "null" => Ok(Event::Null),
_ => Err(MerdeYamlError::ParseError {
expected_type: "null",
}),
},
_ => Ok(Event::Str(s.into())),
}
} else {

let (ev, _marker) = match self.parser.next_token() {
Ok(ev) => ev,
Err(e) => {
// TODO: add location info, etc.
return Err(e.into());
}
};
println!("ev = {ev:?}");

use yaml_rust2::Event as YEvent;

let res = match ev {
YEvent::StreamEnd => Err(MerdeYamlError::Eof),
YEvent::Nothing
| YEvent::StreamStart
| YEvent::DocumentStart
| YEvent::DocumentEnd => {
// ignore those
continue;
}
YEvent::Alias(_) => {
todo!("aliases?")
}
YEvent::Scalar(s, style, _anchor_id, tag) => {
if style != TScalarStyle::Plain {
Ok(Event::Str(s.into()))
}
} else {
// Datatype is not specified, try to infer
if let Ok(v) = s.parse::<bool>() {
Ok(Event::Bool(v))
} else if let Ok(v) = s.parse::<i64>() {
Ok(Event::Int(v))
} else if let Ok(v) = s.parse::<f64>() {
Ok(Event::Float(v))
} else if s == "~" || s == "null" {
Ok(Event::Null)
} else if let Some(tag) = tag {
if tag.handle == "tag:yaml.org,2002:" {
// TODO: use faster int/float parsers
match tag.suffix.as_ref() {
"bool" => match s.parse::<bool>() {
Ok(v) => Ok(Event::Bool(v)),
Err(_) => Err(MerdeYamlError::ParseError {
expected_type: "bool",
}),
},
"int" => match s.parse::<i64>() {
Ok(v) => Ok(Event::Int(v)),
Err(_) => Err(MerdeYamlError::ParseError {
expected_type: "int",
}),
},
"float" => match s.parse::<f64>() {
Ok(v) => Ok(Event::Float(v)),
Err(_) => Err(MerdeYamlError::ParseError {
expected_type: "float",
}),
},
"null" => match s.as_ref() {
"~" | "null" => Ok(Event::Null),
_ => Err(MerdeYamlError::ParseError {
expected_type: "null",
}),
},
_ => Ok(Event::Str(s.into())),
}
} else {
Ok(Event::Str(s.into()))
}
} else {
Ok(Event::Str(s.into()))
// Datatype is not specified, try to infer
if let Ok(v) = s.parse::<bool>() {
Ok(Event::Bool(v))
} else if let Ok(v) = s.parse::<i64>() {
Ok(Event::Int(v))
} else if let Ok(v) = s.parse::<f64>() {
Ok(Event::Float(v))
} else if s == "~" || s == "null" {
Ok(Event::Null)
} else {
Ok(Event::Str(s.into()))
}
}
}
}
YEvent::SequenceStart(_, _tag) => Ok(Event::ArrayStart(ArrayStart { size_hint: None })),
YEvent::SequenceEnd => Ok(Event::ArrayEnd),
YEvent::MappingStart(_, _tag) => Ok(Event::MapStart),
YEvent::MappingEnd => Ok(Event::MapEnd),
YEvent::SequenceStart(_, _tag) => {
Ok(Event::ArrayStart(ArrayStart { size_hint: None }))
}
YEvent::SequenceEnd => Ok(Event::ArrayEnd),
YEvent::MappingStart(_, _tag) => Ok(Event::MapStart),
YEvent::MappingEnd => Ok(Event::MapEnd),
};
return res;
}
}

Expand Down

0 comments on commit a6431c7

Please sign in to comment.