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): get function by scope_id in set_function_node_flag (#2208)

Browse source
This commit is contained in:
Dunqing 2024-01-30 11:43:35 +08:00 committed by GitHub
parent 872d751a18
commit c62495d23f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,8 +55,6 @@ pub struct SemanticBuilder<'a> {
pub current_node_flags: NodeFlags, pub current_node_flags: NodeFlags,
pub current_symbol_flags: SymbolFlags, pub current_symbol_flags: SymbolFlags,
pub current_scope_id: ScopeId, pub current_scope_id: ScopeId,
/// Stores current `AstKind::Function` and `AstKind::ArrowExpression` during AST visit
pub function_stack: Vec<AstNodeId>,
// To make a namespace/module value like // To make a namespace/module value like
// we need the to know the modules we are inside // we need the to know the modules we are inside
// and when we reach a value declaration we set it // and when we reach a value declaration we set it
@ -106,7 +104,6 @@ impl<'a> SemanticBuilder<'a> {
current_symbol_flags: SymbolFlags::empty(), current_symbol_flags: SymbolFlags::empty(),
in_type_definition: false, in_type_definition: false,
current_scope_id, current_scope_id,
function_stack: vec![],
namespace_stack: vec![], namespace_stack: vec![],
nodes: AstNodes::default(), nodes: AstNodes::default(),
scope, scope,
@ -230,8 +227,9 @@ impl<'a> SemanticBuilder<'a> {
} }
pub fn set_function_node_flag(&mut self, flag: NodeFlags) { pub fn set_function_node_flag(&mut self, flag: NodeFlags) {
if let Some(current_function) = self.function_stack.last() { if self.current_scope_flags().is_function() {
*self.nodes.get_node_mut(*current_function).flags_mut() |= flag; *self.nodes.get_node_mut(self.scope.get_node_id(self.current_scope_id)).flags_mut() |=
flag;
} }
} }
@ -1554,14 +1552,12 @@ impl<'a> SemanticBuilder<'a> {
} }
AstKind::StaticBlock(_) => self.label_builder.enter_function_or_static_block(), AstKind::StaticBlock(_) => self.label_builder.enter_function_or_static_block(),
AstKind::Function(func) => { AstKind::Function(func) => {
self.function_stack.push(self.current_node_id);
func.bind(self); func.bind(self);
self.label_builder.enter_function_or_static_block(); self.label_builder.enter_function_or_static_block();
self.add_current_node_id_to_current_scope(); self.add_current_node_id_to_current_scope();
self.make_all_namespaces_valuelike(); self.make_all_namespaces_valuelike();
} }
AstKind::ArrowExpression(_) => { AstKind::ArrowExpression(_) => {
self.function_stack.push(self.current_node_id);
self.add_current_node_id_to_current_scope(); self.add_current_node_id_to_current_scope();
self.make_all_namespaces_valuelike(); self.make_all_namespaces_valuelike();
} }
@ -1658,16 +1654,9 @@ impl<'a> SemanticBuilder<'a> {
self.current_symbol_flags -= Self::symbol_flag_from_module_declaration(decl); self.current_symbol_flags -= Self::symbol_flag_from_module_declaration(decl);
} }
AstKind::LabeledStatement(_) => self.label_builder.leave(), AstKind::LabeledStatement(_) => self.label_builder.leave(),
AstKind::StaticBlock(_) => { AstKind::StaticBlock(_) | AstKind::Function(_) => {
self.label_builder.leave_function_or_static_block(); self.label_builder.leave_function_or_static_block();
} }
AstKind::Function(_) => {
self.label_builder.leave_function_or_static_block();
self.function_stack.pop();
}
AstKind::ArrowExpression(_) => {
self.function_stack.pop();
}
AstKind::TSModuleBlock(_) => { AstKind::TSModuleBlock(_) => {
self.namespace_stack.pop(); self.namespace_stack.pop();
} }