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

Implement ExactSizeIterator for the other node types.

Browse Source
This commit is contained in:
Tom Alexander 2023-10-10 15:27:03 -04:00
parent b7f7876706
commit c578bb45af
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/iter/ast_node_iter.rs
View File

@ -202,35 +202,14 @@ impl<'r, 's> AstNodeIter<'r, 's> {
}
}
pub struct DocumentIter<'r, 's> {
zeroth_section: std::option::Iter<'r, Section<'s>>,
children: std::slice::Iter<'r, Heading<'s>>,
}
impl<'r, 's> Iterator for DocumentIter<'r, 's> {
type Item = AstNode<'r, 's>;
fn next(&mut self) -> Option<Self::Item> {
self.zeroth_section
.next()
.map(Into::<AstNode>::into)
.or_else(|| self.children.next().map(Into::<AstNode>::into))
}
fn size_hint(&self) -> (usize, Option<usize>) {
let size = self.zeroth_section.len() + self.children.len();
(size, Some(size))
}
}
impl<'r, 's> ExactSizeIterator for DocumentIter<'r, 's> {}
impl<'r, 's> IntoIterator for &'r Document<'s> {
type Item = AstNode<'r, 's>;
type IntoIter = DocumentIter<'r, 's>;
fn into_iter(self) -> Self::IntoIter {
DocumentIter {
zeroth_section: self.zeroth_section.iter(),
children: self.children.iter(),
}
}
}
multi_field_iter!(
Document<'s>,
DocumentIter,
zeroth_section,
std::option::Iter<'r, Section<'s>>,
children,
std::slice::Iter<'r, Heading<'s>>
);
multi_field_iter!(
Heading<'s>,
HeadingIter,

13
src/iter/macros.rs
View File

@ -11,8 +11,15 @@ macro_rules! children_iter {
fn next(&mut self) -> Option<Self::Item> {
self.next.next().map(Into::<AstNode>::into)
}
fn size_hint(&self) -> (usize, Option<usize>) {
let size = self.next.len();
(size, Some(size))
}
}
impl<'r, 's> ExactSizeIterator for $itertype<'r, 's> {}
impl<'r, 's> IntoIterator for &'r $astnodetype {
type Item = AstNode<'r, 's>;
@ -42,8 +49,14 @@ macro_rules! empty_iter {
fn next(&mut self) -> Option<Self::Item> {
None
}
fn size_hint(&self) -> (usize, Option<usize>) {
(0, Some(0))
}
}
impl<'r, 's> ExactSizeIterator for $itertype<'r, 's> {}
impl<'r, 's> IntoIterator for &'r $astnodetype {
type Item = AstNode<'r, 's>;