compare_properties keyword.

src/compare/diff.rs

@@ -2431,48 +2431,49 @@ fn compare_horizontal_rule<'b, 's>(
 }
 
 fn compare_keyword<'b, 's>(
-    _source: &'s str,
+    source: &'s str,
     emacs: &'b Token<'s>,
     rust: &'b Keyword<'s>,
 ) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
-    let child_status = Vec::new();
     let mut this_status = DiffStatus::Good;
+    let mut child_status = Vec::new();
     let mut message = None;
 
-    // TODO: Compare :caption
-    // Compare name
-    let name = get_property_quoted_string(emacs, ":name")?;
-    if name.as_ref().map(String::as_str) != rust.name {
-        this_status = DiffStatus::Bad;
-        message = Some(format!(
-            "Name mismatch (emacs != rust) {:?} != {:?}",
-            name, rust.name
-        ));
-    }
+    assert_no_children(emacs, &mut this_status, &mut message)?;
 
-    let key = unquote(
-        get_property(emacs, ":key")?
-            .ok_or("Emacs keywords should have a :key")?
-            .as_atom()?,
-    )?;
-    if key != rust.key.to_uppercase() {
-        this_status = DiffStatus::Bad;
-        message = Some(format!(
-            "Mismatchs keyword keys (emacs != rust) {:?} != {:?}",
-            key, rust.key
-        ))
-    }
-    let value = unquote(
-        get_property(emacs, ":value")?
-            .ok_or("Emacs keywords should have a :value")?
-            .as_atom()?,
-    )?;
-    if value != rust.value {
-        this_status = DiffStatus::Bad;
-        message = Some(format!(
-            "Mismatchs keyword values (emacs != rust) {:?} != {:?}",
-            value, rust.value
-        ))
+    for diff in compare_properties!(
+        source,
+        emacs,
+        rust,
+        (
+            EmacsField::Optional(":name"),
+            |r| r.name,
+            compare_property_quoted_string
+        ),
+        (
+            EmacsField::Optional(":caption"),
+            compare_identity,
+            compare_noop
+        ),
+        (
+            EmacsField::Required(":key"),
+            |r| Some(r.key.to_uppercase()),
+            compare_property_quoted_string
+        ),
+        (
+            EmacsField::Required(":value"),
+            |r| Some(r.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 {