Compare value, duration, and status.

This commit is contained in:
Tom Alexander
2023-10-05 03:19:17 -04:00
parent 02af3d0081
commit b478b6f5d7
8 changed files with 104 additions and 44 deletions

View File

@@ -23,6 +23,7 @@ use crate::types::CheckboxType;
use crate::types::Citation;
use crate::types::CitationReference;
use crate::types::Clock;
use crate::types::ClockStatus;
use crate::types::Code;
use crate::types::Comment;
use crate::types::CommentBlock;
@@ -2097,16 +2098,55 @@ fn compare_clock<'b, 's>(
emacs: &'b Token<'s>,
rust: &'b Clock<'s>,
) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
let this_status = DiffStatus::Good;
let message = None;
let mut child_status = Vec::new();
let mut this_status = DiffStatus::Good;
let mut message = None;
// TODO: Compare :status :value :duration
// Compare value
let value = get_property(emacs, ":value")?;
match value {
Some(e) => {
let result = compare_ast_node(_source, e, (&rust.timestamp).into())?;
child_status.push(artificial_diff_scope("value", vec![result])?);
}
None => {
this_status = DiffStatus::Bad;
message = Some(format!(
"Value mismatch (emacs != rust) {:?} != {:?}",
value, rust.timestamp
));
}
}
// Compare duration
let duration = get_property_quoted_string(emacs, ":duration")?;
if duration.as_ref().map(String::as_str) != rust.duration {
this_status = DiffStatus::Bad;
message = Some(format!(
"Duration mismatch (emacs != rust) {:?} != {:?}",
duration, rust.duration
));
}
// Compare status
let status = get_property_unquoted_atom(emacs, ":status")?;
match (status, &rust.status) {
(Some("running"), ClockStatus::Running) => {}
(Some("closed"), ClockStatus::Closed) => {}
_ => {
this_status = DiffStatus::Bad;
message = Some(format!(
"Status mismatch (emacs != rust) {:?} != {:?}",
status, rust.status
));
}
}
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,
}