diff --git a/src/iter/ast_node_iter.rs b/src/iter/ast_node_iter.rs index 89d35a89..6c51c119 100644 --- a/src/iter/ast_node_iter.rs +++ b/src/iter/ast_node_iter.rs @@ -3,7 +3,6 @@ use std::marker::PhantomData; use super::ast_node::AstNode; use super::macros::children_iter; use super::macros::empty_iter; -use super::macros::multi_field_getter_iter; use super::macros::multi_field_iter; use crate::types::AngleLink; use crate::types::BabelCall; @@ -224,12 +223,12 @@ children_iter!( PlainListIter, std::slice::Iter<'r, PlainListItem<'s>> ); -multi_field_getter_iter!( +multi_field_iter!( PlainListItem<'s>, PlainListItemIter, - get_tag, + tag, std::slice::Iter<'r, Object<'s>>, - get_children, + children, std::slice::Iter<'r, Element<'s>> ); children_iter!( diff --git a/src/iter/macros.rs b/src/iter/macros.rs index 466a0111..3834d1b5 100644 --- a/src/iter/macros.rs +++ b/src/iter/macros.rs @@ -112,43 +112,3 @@ $fieldname: self.$fieldname.iter(), } pub(crate) use multi_field_iter; - -/// Create iterators for ast nodes using getters where it has to iterate over multiple child lists. -macro_rules! multi_field_getter_iter { - ($astnodetype:ty, $itertype:ident, $firstfieldname: ident, $firstinnertype:ty, $($fieldname: ident, $innertype:ty),*) => { - pub struct $itertype<'r, 's> { - $firstfieldname: $firstinnertype, - $( -$fieldname: $innertype, -),* - } - - impl<'r, 's> Iterator for $itertype<'r, 's> { - type Item = AstNode<'r, 's>; - - fn next(&mut self) -> Option { - self.$firstfieldname.next().map(Into::::into) - $( -.or_else(|| self.$fieldname.next().map(Into::::into)) -),* - } - } - - impl<'r, 's> IntoIterator for &'r $astnodetype { - type Item = AstNode<'r, 's>; - - type IntoIter = $itertype<'r, 's>; - - fn into_iter(self) -> Self::IntoIter { - $itertype { - $firstfieldname: self.$firstfieldname().iter(), - $( -$fieldname: self.$fieldname().iter(), -),* - } - } - } - }; -} - -pub(crate) use multi_field_getter_iter;