zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-22 18:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Support the merge key syntax for yaml deserialization.

Browse Source 
https://yaml.org/type/merge.html
This commit is contained in:
Jeremy Wall 2019-08-12 13:19:56 -05:00
parent eb764b048a
commit dffa535f1b
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/convert/yaml.rs
View File

@ -71,6 +71,33 @@ impl YamlConverter {
Ok(yaml_val) Ok(yaml_val)
} }
fn merge_mapping_keys(&self, mut fs: &mut Vec<(String, Rc<Val>)>, m: &serde_yaml::Mapping) -> Result<(), Box<dyn Error>> {
for (key, value) in m {
// This is a little gross but since yaml allows maps to be keyed
// by more than just a string it's necessary.
let key = match key {
serde_yaml::Value::Bool(b) => b.to_string(),
serde_yaml::Value::Null => "null".to_string(),
serde_yaml::Value::Number(n) => n.to_string(),
serde_yaml::Value::String(s) => s.clone(),
serde_yaml::Value::Sequence(_) | serde_yaml::Value::Mapping(_) => {
eprintln!("Unsupported key type in yaml import skipping");
continue;
}
};
if key == "<<" {
// TODO(jwall): Handle merge keys
if let serde_yaml::Value::Mapping(merge_map) = value {
self.merge_mapping_keys(&mut fs, merge_map)?;
}
} else {
fs.push((key, Rc::new(self.convert_yaml_val(&value)?)));
}
}
Ok(())
}
fn convert_yaml_val(&self, v: &serde_yaml::Value) -> Result<Val, Box<dyn Error>> { fn convert_yaml_val(&self, v: &serde_yaml::Value) -> Result<Val, Box<dyn Error>> {
Ok(match v { Ok(match v {
serde_yaml::Value::String(s) => Val::Str(s.clone()), serde_yaml::Value::String(s) => Val::Str(s.clone()),
@ -92,22 +119,7 @@ impl YamlConverter {
} }
serde_yaml::Value::Mapping(m) => { serde_yaml::Value::Mapping(m) => {
let mut fs = Vec::with_capacity(m.len()); let mut fs = Vec::with_capacity(m.len());
for (key, value) in m { self.merge_mapping_keys(&mut fs, m)?;
// This is a little gross but since yaml allows maps to be keyed
// by more than just a string it's necessary.
let key = match key {
serde_yaml::Value::Bool(b) => b.to_string(),
serde_yaml::Value::Null => "null".to_string(),
serde_yaml::Value::Number(n) => n.to_string(),
serde_yaml::Value::String(s) => s.clone(),
serde_yaml::Value::Sequence(_) | serde_yaml::Value::Mapping(_) => {
eprintln!("Unsupported key type in yaml import skipping");
continue;
}
};
eprintln!("yaml key is: {}", key);
fs.push((key, Rc::new(self.convert_yaml_val(value)?)));
}
Val::Tuple(fs) Val::Tuple(fs)
} }
}) })