Add use_brackets.

This commit is contained in:
Tom Alexander
2023-10-08 18:14:48 -04:00
parent ef591556fe
commit 7fe7e7a6ea
4 changed files with 46 additions and 17 deletions

View File

@@ -159,3 +159,24 @@ pub(crate) fn compare_property_list_of_quoted_string<
}
Ok(None)
}
pub(crate) fn compare_property_boolean<'b, 's, 'x, R, RG: Fn(R) -> bool>(
emacs: &'b Token<'s>,
rust_node: R,
emacs_field: &'x str,
rust_value_getter: RG,
) -> Result<Option<(DiffStatus, Option<String>)>, Box<dyn std::error::Error>> {
// get_property already converts nil to None.
let value = get_property(emacs, emacs_field)?.is_some();
let rust_value = rust_value_getter(rust_node);
if rust_value != value {
let this_status = DiffStatus::Bad;
let message = Some(format!(
"{} mismatch (emacs != rust) {:?} != {:?}",
emacs_field, value, rust_value
));
Ok(Some((this_status, message)))
} else {
Ok(None)
}
}

View File

@@ -7,6 +7,7 @@ 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_boolean;
use super::compare_field::compare_property_list_of_quoted_string;
use super::compare_field::compare_property_quoted_string;
use super::compare_field::compare_property_unquoted_atom;
@@ -3129,38 +3130,39 @@ fn compare_entity<'b, 's>(
),
(
EmacsField::Required(":latex"),
compare_identity,
compare_noop
|r| Some(r.latex),
compare_property_quoted_string
),
(
EmacsField::Required(":latex-math-p"),
compare_identity,
compare_noop
|r| r.latex_math_mode,
compare_property_boolean
),
(
EmacsField::Required(":html"),
compare_identity,
compare_noop
|r| Some(r.html),
compare_property_quoted_string
),
(
EmacsField::Required(":ascii"),
compare_identity,
compare_noop
|r| Some(r.ascii),
compare_property_quoted_string
),
(
// latin1... like I give a shit.
EmacsField::Required(":latin1"),
compare_identity,
compare_noop
),
(
EmacsField::Required(":utf-8"),
compare_identity,
compare_noop
|r| Some(r.utf8),
compare_property_quoted_string
),
(
EmacsField::Required(":use-brackets-p"),
compare_identity,
compare_noop
|r| r.use_brackets,
compare_property_boolean
)
)? {
this_status = new_status;