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

compare_properties footnote definition.

Browse Source
This commit is contained in:
Tom Alexander 2023-10-09 22:32:25 -04:00
parent 62926bb91d
commit 4c89d6c813
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
1 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/compare/diff.rs
View File

@ -1424,36 +1424,52 @@ fn compare_footnote_definition<'b, 's>(
emacs: &'b Token<'s>, emacs: &'b Token<'s>,
rust: &'b FootnoteDefinition<'s>, rust: &'b FootnoteDefinition<'s>,
) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> { ) -> 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 this_status = DiffStatus::Good;
let mut child_status = Vec::new();
let mut message = None; let mut message = None;
// TODO: Compare :pre-blank
// TODO: Compare :caption compare_children(
// Compare name source,
let name = get_property_quoted_string(emacs, ":name")?; emacs,
if name.as_ref().map(String::as_str) != rust.name { &rust.children,
this_status = DiffStatus::Bad; &mut child_status,
message = Some(format!( &mut this_status,
"Name mismatch (emacs != rust) {:?} != {:?}", &mut message,
name, rust.name )?;
));
}
// Compare label for diff in compare_properties!(
let label = get_property_quoted_string(emacs, ":label")? source,
.ok_or("Footnote definitions should have a name.")?; emacs,
if label != rust.label { rust,
this_status = DiffStatus::Bad; (
message = Some(format!( EmacsField::Optional(":name"),
"Label mismatch (emacs != rust) {:?} != {:?}", |r| r.name,
label, rust.label compare_property_quoted_string
)); ),
} (
EmacsField::Optional(":caption"),
for (emacs_child, rust_child) in children.iter().skip(2).zip(rust.children.iter()) { compare_identity,
child_status.push(compare_ast_node(source, emacs_child, rust_child.into())?); compare_noop
),
(
EmacsField::Required(":label"),
|r| Some(r.label),
compare_property_quoted_string
),
(
EmacsField::Required(":pre-blank"),
compare_identity,
compare_noop
)
) {
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),
}
} }
Ok(DiffResult { Ok(DiffResult {