dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(semantic): convert scope fields to IndexVecs (#4208)

Browse source 
Closes: https://github.com/oxc-project/backlog/issues/10
This commit is contained in:
lucab 2024-07-12 09:43:58 +00:00
parent 92ee77487f
commit 81ed5885a8
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/oxc_semantic/src/builder.rs
View file

@ -1793,7 +1793,7 @@ impl<'a> SemanticBuilder<'a> {
} }
fn add_current_node_id_to_current_scope(&mut self) { fn add_current_node_id_to_current_scope(&mut self) {
self.scope.add_node_id(self.current_scope_id, self.current_node_id); self.scope.set_node_id(self.current_scope_id, self.current_node_id);
} }
fn make_all_namespaces_valuelike(&mut self) { fn make_all_namespaces_valuelike(&mut self) {

32
crates/oxc_semantic/src/scope.rs
View file

@ -18,13 +18,12 @@ pub(crate) type UnresolvedReferences = FxHashMap<CompactStr, Vec<ReferenceId>>;
/// `SoA` (Struct of Arrays) for memory efficiency. /// `SoA` (Struct of Arrays) for memory efficiency.
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct ScopeTree { pub struct ScopeTree {
/// Maps a scope to the parent scope it belongs in /// Maps a scope to the parent scope it belongs in.
parent_ids: IndexVec<ScopeId, Option<ScopeId>>, parent_ids: IndexVec<ScopeId, Option<ScopeId>>,
/// Maps a scope to direct children scopes.
/// Maps a scope to direct children scopes child_ids: IndexVec<ScopeId, Vec<ScopeId>>,
child_ids: FxHashMap<ScopeId, Vec<ScopeId>>, /// Maps a scope to its node id.
// Maps a scope to its node id node_ids: IndexVec<ScopeId, AstNodeId>,
node_ids: FxHashMap<ScopeId, AstNodeId>,
flags: IndexVec<ScopeId, ScopeFlags>, flags: IndexVec<ScopeId, ScopeFlags>,
bindings: IndexVec<ScopeId, Bindings>, bindings: IndexVec<ScopeId, Bindings>,
pub(crate) root_unresolved_references: UnresolvedReferences, pub(crate) root_unresolved_references: UnresolvedReferences,
@ -48,10 +47,10 @@ impl ScopeTree {
// have recursive closures // have recursive closures
fn add_to_list( fn add_to_list(
parent_id: ScopeId, parent_id: ScopeId,
child_ids: &FxHashMap<ScopeId, Vec<ScopeId>>, child_ids: &IndexVec<ScopeId, Vec<ScopeId>>,
items: &mut Vec<ScopeId>, items: &mut Vec<ScopeId>,
) { ) {
if let Some(children) = child_ids.get(&parent_id) { if let Some(children) = child_ids.get(parent_id) {
for child_id in children { for child_id in children {
items.push(*child_id); items.push(*child_id);
add_to_list(*child_id, child_ids, items); add_to_list(*child_id, child_ids, items);
@ -67,11 +66,11 @@ impl ScopeTree {
} }
pub fn get_child_ids(&self, scope_id: ScopeId) -> Option<&Vec<ScopeId>> { pub fn get_child_ids(&self, scope_id: ScopeId) -> Option<&Vec<ScopeId>> {
self.child_ids.get(&scope_id) self.child_ids.get(scope_id)
} }
pub fn get_child_ids_mut(&mut self, scope_id: ScopeId) -> Option<&mut Vec<ScopeId>> { pub fn get_child_ids_mut(&mut self, scope_id: ScopeId) -> Option<&mut Vec<ScopeId>> {
self.child_ids.get_mut(&scope_id) self.child_ids.get_mut(scope_id)
} }
pub fn descendants_from_root(&self) -> impl Iterator<Item = ScopeId> + '_ { pub fn descendants_from_root(&self) -> impl Iterator<Item = ScopeId> + '_ {
@ -132,7 +131,7 @@ impl ScopeTree {
pub fn set_parent_id(&mut self, scope_id: ScopeId, parent_id: Option<ScopeId>) { pub fn set_parent_id(&mut self, scope_id: ScopeId, parent_id: Option<ScopeId>) {
self.parent_ids[scope_id] = parent_id; self.parent_ids[scope_id] = parent_id;
if let Some(parent_id) = parent_id { if let Some(parent_id) = parent_id {
self.child_ids.entry(parent_id).or_default().push(scope_id); self.child_ids[parent_id].push(scope_id);
} }
} }
@ -167,7 +166,7 @@ impl ScopeTree {
} }
pub fn get_node_id(&self, scope_id: ScopeId) -> AstNodeId { pub fn get_node_id(&self, scope_id: ScopeId) -> AstNodeId {
self.node_ids[&scope_id] self.node_ids[scope_id]
} }
pub fn iter_bindings(&self) -> impl Iterator<Item = (ScopeId, SymbolId, &'_ CompactStr)> + '_ { pub fn iter_bindings(&self) -> impl Iterator<Item = (ScopeId, SymbolId, &'_ CompactStr)> + '_ {
@ -182,18 +181,21 @@ impl ScopeTree {
pub fn add_scope(&mut self, parent_id: Option<ScopeId>, flags: ScopeFlags) -> ScopeId { pub fn add_scope(&mut self, parent_id: Option<ScopeId>, flags: ScopeFlags) -> ScopeId {
let scope_id = self.parent_ids.push(parent_id); let scope_id = self.parent_ids.push(parent_id);
_ = self.child_ids.push(vec![]);
_ = self.flags.push(flags); _ = self.flags.push(flags);
_ = self.bindings.push(Bindings::default()); _ = self.bindings.push(Bindings::default());
_ = self.node_ids.push(AstNodeId::dummy());
// Set this scope as child of parent scope.
if let Some(parent_id) = parent_id { if let Some(parent_id) = parent_id {
self.child_ids.entry(parent_id).or_default().push(scope_id); self.child_ids[parent_id].push(scope_id);
} }
scope_id scope_id
} }
pub(crate) fn add_node_id(&mut self, scope_id: ScopeId, node_id: AstNodeId) { pub(crate) fn set_node_id(&mut self, scope_id: ScopeId, node_id: AstNodeId) {
self.node_ids.insert(scope_id, node_id); self.node_ids[scope_id] = node_id;
} }
pub fn add_binding(&mut self, scope_id: ScopeId, name: CompactStr, symbol_id: SymbolId) { pub fn add_binding(&mut self, scope_id: ScopeId, name: CompactStr, symbol_id: SymbolId) {