diff --git a/src/compare/diff.rs b/src/compare/diff.rs index fe8cd8a..859189a 100644 --- a/src/compare/diff.rs +++ b/src/compare/diff.rs @@ -1484,24 +1484,34 @@ fn compare_footnote_definition<'b, 's>( } fn compare_comment<'b, 's>( - _source: &'s str, + source: &'s str, emacs: &'b Token<'s>, rust: &'b Comment<'s>, ) -> Result, Box> { - let child_status = Vec::new(); let mut this_status = DiffStatus::Good; + let mut child_status = Vec::new(); let mut message = None; - // Compare value - let value = - get_property_quoted_string(emacs, ":value")?.ok_or("Comments should have a value.")?; - let rust_value = rust.get_value(); - if value != rust_value { - this_status = DiffStatus::Bad; - message = Some(format!( - "Value mismatch (emacs != rust) {:?} != {:?}", - value, rust_value - )); + assert_no_children(emacs, &mut this_status, &mut message)?; + + for diff in compare_properties!( + source, + emacs, + rust, + ( + EmacsField::Required(":value"), + |r| Some(r.get_value()), + compare_property_quoted_string + ) + ) { + 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 {