talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

compare_properties plain list.

Browse Source
This commit is contained in:
Tom Alexander 2023-10-09 21:42:07 -04:00
parent 7a38d1ead3
commit 409a92333e
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
1 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/compare/diff.rs
View File

@ -1059,43 +1059,53 @@ fn compare_plain_list<'b, 's>(
emacs: &'b Token<'s>,
rust: &'b PlainList<'s>,
) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
let children = emacs.as_list()?;
let mut child_status = Vec::new();
let mut this_status = DiffStatus::Good;
let mut child_status = Vec::new();
let mut message = None;
// TODO: Compare :caption
// Compare name
let name = get_property_quoted_string(emacs, ":name")?;
if name.as_ref().map(String::as_str) != rust.name {
this_status = DiffStatus::Bad;
message = Some(format!(
"Name mismatch (emacs != rust) {:?} != {:?}",
name, rust.name
));
}
compare_children(
source,
emacs,
&rust.children,
&mut child_status,
&mut this_status,
&mut message,
)?;
// Compare type
// :type is an unquoted atom of either descriptive, ordered, or unordered
let list_type = get_property_unquoted_atom(emacs, ":type")?;
match (list_type, &rust.list_type) {
(None, _) => panic!("Emacs returned a list with no type."),
(Some("unordered"), PlainListType::Unordered) => {}
(Some("ordered"), PlainListType::Ordered) => {}
(Some("descriptive"), PlainListType::Descriptive) => {}
_ => {
this_status = DiffStatus::Bad;
message = Some(format!(
"List type mismatch (emacs != rust) {:?} != {:?}",
list_type, rust.list_type
));
for diff in compare_properties!(
source,
emacs,
rust,
(
EmacsField::Optional(":name"),
|r| r.name,
compare_property_quoted_string
),
(
EmacsField::Optional(":caption"),
compare_identity,
compare_noop
),
(
EmacsField::Required(":type"),
|r| Some(match r.list_type {
PlainListType::Unordered => "unordered",
PlainListType::Ordered => "ordered",
PlainListType::Descriptive => "descriptive",
}),
compare_property_unquoted_atom
)
) {
match diff {
ComparePropertiesResult::NoChange => {}
ComparePropertiesResult::SelfChange(new_status, new_message) => {
this_status = new_status;
message = new_message
}
ComparePropertiesResult::DiffEntry(diff_entry) => child_status.push(diff_entry),
}
}
for (emacs_child, rust_child) in children.iter().skip(2).zip(rust.children.iter()) {
child_status.push(compare_ast_node(source, emacs_child, rust_child.into())?);
}
Ok(DiffResult {
status: this_status,
name: rust.get_elisp_name(),