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

Add TODOs for all of the properties that need to be compared.
Some checks failed
rust-foreign-document-test Build rust-foreign-document-test has started
Details
rustfmt Build rustfmt has failed
Details
rust-build Build rust-build has failed
Details
rust-test Build rust-test has failed
Details

Browse Source
This commit is contained in:
Tom Alexander
2023-09-23 14:46:36 -04:00
parent f7690ff64b
commit 1f64e289a2
2 changed files with 93 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/compare/diff.rs
View File

@@ -1,3 +1,4 @@
// TODO: Add a check for unexpected keys in the properties
use std::collections::BTreeSet;
use std::collections::HashSet;
@@ -387,7 +388,9 @@ pub fn compare_document<'s>(
this_status = DiffStatus::Bad;
}
// Skipping "org-data" and the first parameter which is often nil
// TODO: Compare :path :CATEGORY
// Skipping "org-data" and its properties
for (i, token) in children.iter().skip(2).enumerate() {
let section_or_headline = token.as_list()?;
let first_cell = section_or_headline
@@ -618,7 +621,9 @@ fn compare_heading<'s>(
(None, false) | (Some(_), true) => {}
}
// TODO: Compare :footnote-section-p
// TODO: Compare :pre-blank :raw-value :footnote-section-p :scheduled :closed
//
// :scheduled and :closed seem to only appear when the headline has a planning
// Compare section
let section_status = children
@@ -732,7 +737,7 @@ fn compare_plain_list<'s>(
Ok(_) => {}
};
// TODO compare :type
// TODO: Compare :type
//
// :type is an unquoted atom of either descriptive, ordered, or unordered
@@ -804,7 +809,7 @@ fn compare_plain_list_item<'s>(
contents_status,
)?);
// TODO: compare :bullet :counter :pre-blank
// TODO: Compare :bullet :counter :pre-blank
// Compare checkbox
let checkbox = get_property(emacs, ":checkbox")?
@@ -862,6 +867,9 @@ fn compare_greater_block<'s>(
Ok(_) => {}
};
// TODO: Special block compare :type :parameters
// Center and quote block has no additional properties
for (emacs_child, rust_child) in children.iter().skip(2).zip(rust.children.iter()) {
child_status.push(compare_element(source, emacs_child, rust_child)?);
}
@@ -937,6 +945,8 @@ fn compare_footnote_definition<'s>(
Ok(_) => {}
};
// TODO: Compare :label :pre-blank
for (emacs_child, rust_child) in children.iter().skip(2).zip(rust.children.iter()) {
child_status.push(compare_element(source, emacs_child, rust_child)?);
}
@@ -973,6 +983,8 @@ fn compare_comment<'s>(
Ok(_) => {}
};
// TODO: Compare :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -1006,6 +1018,8 @@ fn compare_drawer<'s>(
Ok(_) => {}
};
// TODO: Compare :drawer-name
for (emacs_child, rust_child) in children.iter().skip(2).zip(rust.children.iter()) {
child_status.push(compare_element(source, emacs_child, rust_child)?);
}
@@ -1152,6 +1166,8 @@ fn compare_table<'s>(
}
}
// TODO: Compare :type :value
for (emacs_child, rust_child) in children.iter().skip(2).zip(rust.children.iter()) {
child_status.push(compare_table_row(source, emacs_child, rust_child)?);
}
@@ -1298,6 +1314,8 @@ fn compare_comment_block<'s>(
Ok(_) => {}
};
// TODO: Compare :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -1329,6 +1347,8 @@ fn compare_example_block<'s>(
Ok(_) => {}
};
// TODO: Compare :value :switches :number-lines :preserve-indent :retain-labels :use-labels :label-fmt
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -1360,6 +1380,8 @@ fn compare_export_block<'s>(
Ok(_) => {}
};
// TODO: Compare :type :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -1424,6 +1446,8 @@ fn compare_clock<'s>(
Ok(_) => {}
};
// TODO: Compare :status :value :duration
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -1455,6 +1479,8 @@ fn compare_diary_sexp<'s>(
Ok(_) => {}
};
// TODO: Compare :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -1486,6 +1512,8 @@ fn compare_planning<'s>(
Ok(_) => {}
};
// TODO: Compare :closed :deadline :scheduled
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -1518,6 +1546,8 @@ fn compare_fixed_width_area<'s>(
Ok(_) => {}
};
// TODO: Compare :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -1639,7 +1669,7 @@ fn compare_babel_call<'s>(
Ok(_) => {}
};
// TODO: compare :call :inside-header :arguments :end-header
// TODO: Compare :call :inside-header :arguments :end-header
let value = unquote(
get_property(emacs, ":value")?
.ok_or("Emacs keywords should have a :value")?
@@ -1685,6 +1715,8 @@ fn compare_latex_environment<'s>(
Ok(_) => {}
};
// TODO: Compare :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -1859,6 +1891,8 @@ fn compare_verbatim<'s>(
Ok(_) => {}
};
// TODO: Compare :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -1890,6 +1924,8 @@ fn compare_code<'s>(
Ok(_) => {}
};
// TODO: Compare :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -1985,6 +2021,8 @@ fn compare_radio_link<'s>(
Ok(_) => {}
};
// TODO: Compare :type :path :format :raw-link :application :search-option
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2016,6 +2054,8 @@ fn compare_radio_target<'s>(
Ok(_) => {}
};
// TODO: Compare :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2047,6 +2087,8 @@ fn compare_plain_link<'s>(
Ok(_) => {}
};
// TODO: Compare :type :path :format :raw-link :application :search-option
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2078,6 +2120,8 @@ fn compare_angle_link<'s>(
Ok(_) => {}
};
// TODO: Compare :type :path :format :raw-link :application :search-option
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2109,6 +2153,8 @@ fn compare_org_macro<'s>(
Ok(_) => {}
};
// TODO: Compare :key :value :args
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2140,6 +2186,8 @@ fn compare_entity<'s>(
Ok(_) => {}
};
// TODO: Compare :name :latex :latex-math-p :html :ascii :latin1 :utf-8 :use-brackets-p
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2171,6 +2219,8 @@ fn compare_latex_fragment<'s>(
Ok(_) => {}
};
// TODO: Compare :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2202,6 +2252,8 @@ fn compare_export_snippet<'s>(
Ok(_) => {}
};
// TODO: Compare :back-end :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2233,6 +2285,8 @@ fn compare_footnote_reference<'s>(
Ok(_) => {}
};
// TODO: Compare :label :type
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2264,6 +2318,8 @@ fn compare_citation<'s>(
Ok(_) => {}
};
// TODO: Compare :style :prefix :suffix
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2295,6 +2351,8 @@ fn compare_citation_reference<'s>(
Ok(_) => {}
};
// TODO: Compare :key :prefix :suffix
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2326,6 +2384,8 @@ fn compare_inline_babel_call<'s>(
Ok(_) => {}
};
// TODO: Compare :call :inside-header :arguments :end-header :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2357,6 +2417,8 @@ fn compare_inline_source_block<'s>(
Ok(_) => {}
};
// TODO: Compare :language :value :parameters
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2419,6 +2481,8 @@ fn compare_target<'s>(
Ok(_) => {}
};
// TODO: Compare :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2450,6 +2514,8 @@ fn compare_statistics_cookie<'s>(
Ok(_) => {}
};
// TODO: Compare :value
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),
@@ -2481,7 +2547,7 @@ fn compare_subscript<'s>(
Ok(_) => {}
};
// TODO compare :use-brackets-p
// TODO: Compare :use-brackets-p
Ok(DiffResult {
status: this_status,
@@ -2514,7 +2580,7 @@ fn compare_superscript<'s>(
Ok(_) => {}
};
// TODO compare :use-brackets-p
// TODO: Compare :use-brackets-p
Ok(DiffResult {
status: this_status,
@@ -2547,6 +2613,8 @@ fn compare_timestamp<'s>(
Ok(_) => {}
};
// TODO: Compare :type :range-type :raw-value :year-start :month-start :day-start :hour-start :minute-start :year-end :month-end :day-end :hour-end :minute-end
Ok(DiffResult {
status: this_status,
name: emacs_name.to_owned(),