Compare plain list items inside plain lists.

This commit is contained in:
Tom Alexander 2023-04-12 14:07:33 -04:00
parent 57f56eb860
commit 05c9ec86b8
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
3 changed files with 57 additions and 1 deletions

View File

@ -8,6 +8,7 @@ use crate::parser::GreaterBlock;
use crate::parser::Heading;
use crate::parser::Paragraph;
use crate::parser::PlainList;
use crate::parser::PlainListItem;
use crate::parser::Section;
#[derive(Debug)]
@ -288,7 +289,9 @@ fn compare_plain_list<'s>(
this_status = DiffStatus::Bad;
}
for (emacs_child, rust_child) in children.iter().skip(2).zip(rust.children.iter()) {}
for (emacs_child, rust_child) in children.iter().skip(2).zip(rust.children.iter()) {
child_status.push(compare_plain_list_item(source, emacs_child, rust_child)?);
}
Ok(DiffResult {
status: this_status,
@ -297,6 +300,51 @@ fn compare_plain_list<'s>(
})
}
fn compare_plain_list_item<'s>(
source: &'s str,
emacs: &'s Token<'s>,
rust: &'s PlainListItem<'s>,
) -> Result<DiffResult, Box<dyn std::error::Error>> {
let children = emacs.as_list()?;
let first_child = children
.first()
.ok_or("Should have at least one child.")?
.as_atom()?;
if first_child != "item" {
return Err("PlainListItem should correspond to an item cell.".into());
}
let mut child_status = Vec::new();
let mut this_status = DiffStatus::Good;
let attributes_child = children
.iter()
.nth(1)
.ok_or("Should have an attributes child.")?;
let attributes_map = attributes_child.as_map()?;
let begin = attributes_map
.get(":begin")
.ok_or("Missing :begin attribute.")?
.as_atom()?;
let end = attributes_map
.get(":end")
.ok_or("Missing :end attribute.")?
.as_atom()?;
let (rust_begin, rust_end) = get_offsets(source, rust);
if (rust_begin + 1).to_string() != begin || (rust_end + 1).to_string() != end {
this_status = DiffStatus::Bad;
}
for (emacs_child, rust_child) in children.iter().skip(2).zip(rust.children.iter()) {
child_status.push(compare_element(source, emacs_child, rust_child)?);
}
Ok(DiffResult {
status: this_status,
name: "plain-list-item".to_owned(),
children: child_status,
})
}
fn compare_greater_block<'s>(
source: &'s str,
emacs: &'s Token<'s>,

View File

@ -1,3 +1,4 @@
use super::PlainListItem;
use super::error::Res;
use super::footnote_definition::footnote_definition;
use super::greater_block::greater_block;
@ -44,6 +45,12 @@ impl<'s> Source<'s> for PlainList<'s> {
}
}
impl<'s> Source<'s> for PlainListItem<'s> {
fn get_source(&'s self) -> &'s str {
self.source
}
}
impl<'s> Source<'s> for GreaterBlock<'s> {
fn get_source(&'s self) -> &'s str {
self.source

View File

@ -23,6 +23,7 @@ pub use element::Element;
pub use greater_element::FootnoteDefinition;
pub use greater_element::GreaterBlock;
pub use greater_element::PlainList;
pub use greater_element::PlainListItem;
pub use lesser_element::Paragraph;
pub use source::Source;
type Context<'r, 's> = &'r parser_context::ContextTree<'r, 's>;