Skip to content

Commit

Permalink
refactor(semantic): AstNodeParentIter fetch nodes lazily (#4533)
Browse files Browse the repository at this point in the history
Refactor `AstNodeParentIter`, which is used to iterate down node ancestry chain. Fetch `AstNode` objects lazily, only when they're required by a `next()` call. If caller doesn't iterate all the way down the chain, likely this will result in 1 less array lookup.
  • Loading branch information
overlookmotel committed Jul 29, 2024
1 parent 0870ee1 commit d6974d4
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions crates/oxc_semantic/src/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ impl<'a> AstNodes<'a> {
///
/// The first node produced by this iterator is the first parent of the node
/// pointed to by `node_id`. The last node will usually be a `Program`.
#[inline]
pub fn iter_parents(&self, node_id: AstNodeId) -> impl Iterator<Item = &AstNode<'a>> + '_ {
let curr = Some(self.get_node(node_id));
AstNodeParentIter { curr, nodes: self }
AstNodeParentIter { current_node_id: Some(node_id), nodes: self }
}

#[inline]
Expand Down Expand Up @@ -197,17 +197,19 @@ impl<'a> AstNodes<'a> {

#[derive(Debug)]
pub struct AstNodeParentIter<'s, 'a> {
curr: Option<&'s AstNode<'a>>,
current_node_id: Option<AstNodeId>,
nodes: &'s AstNodes<'a>,
}

impl<'s, 'a> Iterator for AstNodeParentIter<'s, 'a> {
type Item = &'s AstNode<'a>;

fn next(&mut self) -> Option<Self::Item> {
let next = self.curr;
self.curr = self.curr.and_then(|curr| self.nodes.parent_node(curr.id()));

next
if let Some(node_id) = self.current_node_id {
self.current_node_id = self.nodes.parent_ids[node_id];
Some(self.nodes.get_node(node_id))
} else {
None
}
}
}

0 comments on commit d6974d4

Please sign in to comment.