Skip to content

Refactor YAML parsing functions #835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moritz-gross wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor YAML parsing functions #835

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 21 additions & 31 deletions src/definitions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,44 +234,34 @@ fn build_values(definition: &Yaml, use_speech_defs: bool, path: &Path) -> Result
return Ok(None);
});

fn get_vec_values(values: &Vec<Yaml>) -> Result<Vec<String>> {
let mut result = Vec::with_capacity(values.len());
for yaml_value in values {
let value = yaml_value.as_str()
.ok_or_else(|| anyhow!("list entry '{}' is not a string", yaml_to_type(yaml_value)))?
.to_string();
result.push(value);
}
return Ok(result);
/// Convert a YAML string to an owned string; fail if the value is not a string.
fn yaml_string(value: &Yaml) -> Result<String> {
Ok(value.as_str()
.ok_or_else(|| anyhow!("list entry '{}' is not a string", yaml_to_type(value)))?
.to_owned()) // &str -> String
}

/// Convert a YAML sequence to strings; fail if any entry is not a string.
fn get_vec_values(values: &[Yaml]) -> Result<Vec<String>> {
values.iter().map(yaml_string).collect()
}

/// Convert null-valued YAML mapping keys to a set; fail on non-string keys or non-null values.
fn get_set_values(values: &Hash) -> Result<HashSet<String>> {
let mut result = HashSet::with_capacity(2*values.len());
for (key, value) in values {
let key = key.as_str()
.ok_or_else(|| anyhow!("list entry '{}' is not a string", yaml_to_type(key)))?
.to_string();
if let Yaml::Null = value {
} else {
bail!("list entry '{}' is not a string", yaml_to_type(value));
values.iter().map(|(key, value)| {
let key = yaml_string(key)?;
match value {
Yaml::Null => Ok(key),
_ => bail!("list entry '{}' is not a string", yaml_to_type(value)),
}
result.insert(key);
}
return Ok(result);
}).collect()
}

/// Convert a YAML mapping to string pairs; fail if any key or value is not a string.
fn get_map_values(values: &Hash) -> Result<HashMap<String, String>> {
let mut result = HashMap::with_capacity(2*values.len());
for (key, value) in values {
let key = key.as_str()
.ok_or_else(|| anyhow!("list entry '{}' is not a string", yaml_to_type(key)))?
.to_string();
let value = value.as_str()
.ok_or_else(|| anyhow!("list entry '{}' is not a string", yaml_to_type(value)))?
.to_string();
result.insert(key, value);
}
return Ok(result);
values.iter().map(|(key, value)| {
Ok((yaml_string(key)?, yaml_string(value)?))
}).collect()
}
}

Expand Down
Loading