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

Compare name and parameters.

Browse Source
This commit is contained in:
Tom Alexander
2023-10-02 22:41:56 -04:00
parent 590e7fba0e
commit 0fb80e3fee
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/compare/diff.rs
View File

@@ -1122,9 +1122,33 @@ fn compare_dynamic_block<'b, 's>(
) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
let children = emacs.as_list()?;
let mut child_status = Vec::new();
let this_status = DiffStatus::Good;
let message = None;
// TODO: Compare :block-name :arguments
let mut this_status = DiffStatus::Good;
let mut message = None;
// Compare block-name
let block_name = get_property_quoted_string(emacs, ":block-name")?
.ok_or("Dynamic blocks should have a name.")?;
if block_name != rust.name {
this_status = DiffStatus::Bad;
message = Some(format!(
"Name mismatch (emacs != rust) {:?} != {:?}",
block_name, rust.name
));
}
// Compare arguments
let parameters = get_property_quoted_string(emacs, ":arguments")?;
match (parameters.as_ref(), rust.parameters) {
(None, None) => {}
(Some(emacs_parameters), Some(rust_parameters)) if emacs_parameters == rust_parameters => {}
_ => {
this_status = DiffStatus::Bad;
message = Some(format!(
"Parameters mismatch (emacs != rust) {:?} != {:?}",
parameters, rust.parameters
));
}
}
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())?);