From 0b1e06f0d51af95b7bcc7ba7b0d14738f1328ae3 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 10 Oct 2023 01:07:41 -0400
Subject: [PATCH] compare_properties export block.

---
 src/compare/diff.rs | 69 ++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/compare/diff.rs b/src/compare/diff.rs
index cbc19f9..9e3cf05 100644
--- a/src/compare/diff.rs
+++ b/src/compare/diff.rs
@@ -2028,51 +2028,56 @@ fn compare_example_block<'b, 's>(
 }
 
 fn compare_export_block<'b, 's>(
-    _source: &'s str,
+    source: &'s str,
     emacs: &'b Token<'s>,
     rust: &'b ExportBlock<'s>,
 ) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
     let mut this_status = DiffStatus::Good;
+    let mut child_status = Vec::new();
     let mut message = None;
 
-    // TODO: Compare :caption
+    assert_no_children(emacs, &mut this_status, &mut message)?;
 
-    // Compare type
-    let export_type = get_property_quoted_string(emacs, ":type")?;
-    let rust_export_type = rust.get_export_type();
-    if export_type != rust_export_type {
-        this_status = DiffStatus::Bad;
-        message = Some(format!(
-            "Export type mismatch (emacs != rust) {:?} != {:?}",
-            export_type, rust.export_type
-        ));
-    }
-
-    // Compare value
-    let contents = get_property_quoted_string(emacs, ":value")?.unwrap_or(String::new());
-    if contents != rust.contents {
-        this_status = DiffStatus::Bad;
-        message = Some(format!(
-            "Value mismatch (emacs != rust) {:?} != {:?}",
-            contents, rust.contents
-        ));
-    }
-
-    // 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
-        ));
+    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(":type"),
+            |r| r.get_export_type(),
+            compare_property_quoted_string
+        ),
+        (
+            EmacsField::Required(":value"),
+            |r| Some(r.contents.as_str()),
+            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 {
         status: this_status,
         name: rust.get_elisp_name(),
         message,
-        children: Vec::new(),
+        children: child_status,
         rust_source: rust.get_source(),
         emacs_token: emacs,
     }