talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

compare_properties planning.

Browse Source
This commit is contained in:
Tom Alexander 2023-10-10 01:24:11 -04:00
parent d5396e311b
commit 0b465fe290
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
1 changed files with 29 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/compare/diff.rs
View File

@ -2284,58 +2284,39 @@ fn compare_planning<'b, 's>(
emacs: &'b Token<'s>, emacs: &'b Token<'s>,
rust: &'b Planning<'s>, rust: &'b Planning<'s>,
) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> { ) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
let mut child_status = Vec::new();
let mut this_status = DiffStatus::Good; let mut this_status = DiffStatus::Good;
let mut child_status = Vec::new();
let mut message = None; let mut message = None;
// Compare scheduled assert_no_children(emacs, &mut this_status, &mut message)?;
let scheduled = get_property(emacs, ":scheduled")?;
match (scheduled, &rust.scheduled) {
(None, None) => {}
(None, Some(_)) | (Some(_), None) => {
this_status = DiffStatus::Bad;
message = Some(format!(
"Scheduled mismatch (emacs != rust) {:?} != {:?}",
scheduled, rust.scheduled
));
}
(Some(emacs_child), Some(rust_child)) => {
let result = compare_ast_node(source, emacs_child, rust_child.into())?;
child_status.push(artificial_diff_scope("scheduled", vec![result])?);
}
}
// Compare deadline for diff in compare_properties!(
let deadline = get_property(emacs, ":deadline")?; source,
match (deadline, &rust.deadline) { emacs,
(None, None) => {} rust,
(None, Some(_)) | (Some(_), None) => { (
this_status = DiffStatus::Bad; EmacsField::Required(":scheduled"),
message = Some(format!( |r| r.scheduled.as_ref(),
"Deadline mismatch (emacs != rust) {:?} != {:?}", compare_property_single_ast_node
deadline, rust.deadline ),
)); (
} EmacsField::Required(":deadline"),
(Some(emacs_child), Some(rust_child)) => { |r| r.deadline.as_ref(),
let result = compare_ast_node(source, emacs_child, rust_child.into())?; compare_property_single_ast_node
child_status.push(artificial_diff_scope("deadline", vec![result])?); ),
} (
} EmacsField::Required(":closed"),
|r| r.closed.as_ref(),
// Compare closed compare_property_single_ast_node
let closed = get_property(emacs, ":closed")?; )
match (closed, &rust.closed) { ) {
(None, None) => {} match diff {
(None, Some(_)) | (Some(_), None) => { ComparePropertiesResult::NoChange => {}
this_status = DiffStatus::Bad; ComparePropertiesResult::SelfChange(new_status, new_message) => {
message = Some(format!( this_status = new_status;
"Closed mismatch (emacs != rust) {:?} != {:?}", message = new_message
closed, rust.closed }
)); ComparePropertiesResult::DiffEntry(diff_entry) => child_status.push(diff_entry),
}
(Some(emacs_child), Some(rust_child)) => {
let result = compare_ast_node(source, emacs_child, rust_child.into())?;
child_status.push(artificial_diff_scope("closed", vec![result])?);
} }
} }