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

Starting to compare entity properties.

Browse Source
This commit is contained in:
Tom Alexander
2023-10-08 17:24:03 -04:00
parent 8a109276df
commit 1df6777b0b
3 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/compare/diff.rs
View File

@@ -5,6 +5,7 @@ use std::collections::BTreeSet;
use std::collections::HashSet;
use super::compare_field::compare_identity;
use super::compare_field::compare_noop;
use super::compare_field::compare_property_always_nil;
use super::compare_field::compare_property_list_of_quoted_string;
use super::compare_field::compare_property_quoted_string;
@@ -3115,10 +3116,56 @@ fn compare_entity<'b, 's>(
emacs: &'b Token<'s>,
rust: &'b Entity<'s>,
) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
let this_status = DiffStatus::Good;
let message = None;
let mut this_status = DiffStatus::Good;
let mut message = None;
// TODO: Compare :name :latex :latex-math-p :html :ascii :latin1 :utf-8 :use-brackets-p
if let Some((new_status, new_message)) = compare_properties!(
emacs,
rust,
(
EmacsField::Required(":name"),
|r| Some(r.name),
compare_property_quoted_string
),
(
EmacsField::Required(":latex"),
compare_identity,
compare_noop
),
(
EmacsField::Required(":latex-math-p"),
compare_identity,
compare_noop
),
(
EmacsField::Required(":html"),
compare_identity,
compare_noop
),
(
EmacsField::Required(":ascii"),
compare_identity,
compare_noop
),
(
EmacsField::Required(":latin1"),
compare_identity,
compare_noop
),
(
EmacsField::Required(":utf-8"),
compare_identity,
compare_noop
),
(
EmacsField::Required(":use-brackets-p"),
compare_identity,
compare_noop
)
)? {
this_status = new_status;
message = new_message;
}
Ok(DiffResult {
status: this_status,