src/compare/diff.rs

@@ -15,8 +15,6 @@ use super::elisp_fact::ElispFact;
 use super::elisp_fact::GetElispFact;
 use super::sexp::unquote;
 use super::sexp::Token;
-use super::util::assert_no_children;
-use super::util::compare_children;
 use super::util::compare_standard_properties;
 use super::util::get_property;
 use super::util::get_property_boolean;
@@ -338,7 +336,7 @@ fn artificial_diff_scope<'b, 's>(
     .into())
 }
 
-pub(crate) fn compare_ast_node<'b, 's>(
+fn compare_ast_node<'b, 's>(
     source: &'s str,
     emacs: &'b Token<'s>,
     rust: AstNode<'b, 's>,
@@ -2908,15 +2906,6 @@ fn compare_radio_target<'b, 's>(
     let mut child_status = Vec::new();
     let mut message = None;
 
-    compare_children(
-        source,
-        emacs,
-        &rust.children,
-        &mut child_status,
-        &mut this_status,
-        &mut message,
-    )?;
-
     if let Some((new_status, new_message)) = compare_properties!(
         emacs,
         rust,
@@ -3196,21 +3185,10 @@ fn compare_latex_fragment<'b, 's>(
     emacs: &'b Token<'s>,
     rust: &'b LatexFragment<'s>,
 ) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
-    let mut this_status = DiffStatus::Good;
+    let this_status = DiffStatus::Good;
-    let mut message = None;
+    let message = None;
 
-    if let Some((new_status, new_message)) = compare_properties!(
+    // TODO: Compare :value
-        emacs,
-        rust,
-        (
-            EmacsField::Required(":value"),
-            |r| Some(r.value),
-            compare_property_quoted_string
-        )
-    )? {
-        this_status = new_status;
-        message = new_message;
-    }
 
     Ok(DiffResult {
         status: this_status,
@@ -3228,28 +3206,10 @@ fn compare_export_snippet<'b, 's>(
     emacs: &'b Token<'s>,
     rust: &'b ExportSnippet<'s>,
 ) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
-    let mut this_status = DiffStatus::Good;
+    let this_status = DiffStatus::Good;
-    let mut message = None;
+    let message = None;
 
-    assert_no_children(emacs, &mut this_status, &mut message)?;
+    // TODO: Compare :back-end :value
-
-    if let Some((new_status, new_message)) = compare_properties!(
-        emacs,
-        rust,
-        (
-            EmacsField::Required(":back-end"),
-            |r| Some(r.backend),
-            compare_property_quoted_string
-        ),
-        (
-            EmacsField::Required(":value"),
-            |r| r.contents,
-            compare_property_quoted_string
-        )
-    )? {
-        this_status = new_status;
-        message = new_message;
-    }
 
     Ok(DiffResult {
         status: this_status,

src/compare/util.rs

@@ -1,12 +1,8 @@
 use std::str::FromStr;
 
-use super::diff::DiffEntry;
-use super::diff::DiffStatus;
 use super::elisp_fact::GetElispFact;
 use super::sexp::Token;
-use crate::compare::diff::compare_ast_node;
 use crate::compare::sexp::unquote;
-use crate::types::AstNode;
 use crate::types::GetStandardProperties;
 use crate::types::StandardProperties;
 
@@ -256,47 +252,3 @@ where
         .map_or(Ok(None), |r| r.map(Some))?;
     Ok(parsed_number)
 }
-
-pub(crate) fn compare_children<'b, 's, 'x, RC>(
-    source: &'s str,
-    emacs: &'b Token<'s>,
-    rust_children: &'x Vec<RC>,
-    child_status: &mut Vec<DiffEntry<'b, 's>>,
-    this_status: &mut DiffStatus,
-    message: &mut Option<String>,
-) -> Result<(), Box<dyn std::error::Error>>
-where
-    AstNode<'b, 's>: From<&'x RC>,
-{
-    let emacs_children = emacs.as_list()?;
-    let emacs_children_length = emacs_children.len() - 2;
-    if emacs_children_length != rust_children.len() {
-        *this_status = DiffStatus::Bad;
-        *message = Some(format!(
-            "Child length mismatch (emacs != rust) {:?} != {:?}",
-            emacs_children_length,
-            rust_children.len()
-        ));
-    }
-    for (emacs_child, rust_child) in emacs_children.iter().skip(2).zip(rust_children.iter()) {
-        child_status.push(compare_ast_node(source, emacs_child, rust_child.into())?);
-    }
-    Ok(())
-}
-
-pub(crate) fn assert_no_children<'b, 's>(
-    emacs: &'b Token<'s>,
-    this_status: &mut DiffStatus,
-    message: &mut Option<String>,
-) -> Result<(), Box<dyn std::error::Error>> {
-    let emacs_children_length = emacs.as_list()?.len();
-    // 2, one for the name of the node and one for the properties. Children would come after that.
-    if emacs_children_length != 2 {
-        *this_status = DiffStatus::Bad;
-        *message = Some(format!(
-            "Should have no children but emacs has {:?} children.",
-            emacs_children_length - 2,
-        ));
-    }
-    Ok(())
-}

src/parser/latex_fragment.rs

@@ -36,7 +36,6 @@ pub(crate) fn latex_fragment<'b, 'g, 'r, 's>(
         parser_with_context!(dollar_char_fragment)(context),
         parser_with_context!(bordered_dollar_fragment)(context),
     ))(input)?;
-    let value = get_consumed(input, remaining);
     let (remaining, _trailing_whitespace) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
@@ -44,7 +43,6 @@ pub(crate) fn latex_fragment<'b, 'g, 'r, 's>(
         remaining,
         LatexFragment {
             source: source.into(),
-            value: value.into(),
         },
     ))
 }

src/types/object.rs

@@ -180,7 +180,6 @@ pub struct Entity<'s> {
 #[derive(Debug, PartialEq)]
 pub struct LatexFragment<'s> {
     pub source: &'s str,
-    pub value: &'s str,
 }
 
 #[derive(Debug, PartialEq)]