Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(transformer): rename var in VarDeclarations common transform #6242

Merged
merged 1 commit into from
Oct 2, 2024
Merged

refactor(transformer): rename var in VarDeclarations common transform #6242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions crates/oxc_transformer/src/common/var_declarations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,18 @@ impl<'a, 'ctx> Traverse<'a> for VarDeclarations<'a, 'ctx> {
self.ctx.top_level_statements.insert_statement(stmt);
}

let declarators = self.ctx.var_declarations.declarators.borrow();
debug_assert!(declarators.len() == 1);
debug_assert!(declarators.last().is_none());
let stack = self.ctx.var_declarations.stack.borrow();
debug_assert!(stack.len() == 1);
debug_assert!(stack.last().is_none());
}

fn enter_statements(
&mut self,
_stmts: &mut Vec<'a, Statement<'a>>,
_ctx: &mut TraverseCtx<'a>,
) {
let mut declarators = self.ctx.var_declarations.declarators.borrow_mut();
declarators.push(None);
let mut stack = self.ctx.var_declarations.stack.borrow_mut();
stack.push(None);
}

fn exit_statements(&mut self, stmts: &mut Vec<'a, Statement<'a>>, ctx: &mut TraverseCtx<'a>) {
Expand All @@ -72,8 +72,8 @@ impl<'a, 'ctx> Traverse<'a> for VarDeclarations<'a, 'ctx> {

impl<'a, 'ctx> VarDeclarations<'a, 'ctx> {
fn get_var_statement(&mut self, ctx: &mut TraverseCtx<'a>) -> Option<Statement<'a>> {
let mut declarators = self.ctx.var_declarations.declarators.borrow_mut();
let declarators = declarators.pop()?;
let mut stack = self.ctx.var_declarations.stack.borrow_mut();
let declarators = stack.pop()?;
debug_assert!(!declarators.is_empty());

let stmt = Statement::VariableDeclaration(ctx.ast.alloc_variable_declaration(
Expand All @@ -88,12 +88,12 @@ impl<'a, 'ctx> VarDeclarations<'a, 'ctx> {

/// Store for `VariableDeclarator`s to be added to enclosing statement block.
pub struct VarDeclarationsStore<'a> {
declarators: RefCell<SparseStack<Vec<'a, VariableDeclarator<'a>>>>,
stack: RefCell<SparseStack<Vec<'a, VariableDeclarator<'a>>>>,
}

impl<'a> VarDeclarationsStore<'a> {
pub fn new() -> Self {
Self { declarators: RefCell::new(SparseStack::new()) }
Self { stack: RefCell::new(SparseStack::new()) }
}
}

Expand Down Expand Up @@ -128,7 +128,7 @@ impl<'a> VarDeclarationsStore<'a> {

/// Add a `VariableDeclarator` to be inserted at top of current enclosing statement block.
pub fn insert_declarator(&self, declarator: VariableDeclarator<'a>, ctx: &mut TraverseCtx<'a>) {
let mut declarators = self.declarators.borrow_mut();
declarators.last_mut_or_init(|| ctx.ast.vec()).push(declarator);
let mut stack = self.stack.borrow_mut();
stack.last_mut_or_init(|| ctx.ast.vec()).push(declarator);
}
}