Skip to content

Commit

Permalink
style(semantic): rename vars for node IDs (#5699)
Browse files Browse the repository at this point in the history
`test_node_id` not `test_node` to better describe what these vars contain.
  • Loading branch information
overlookmotel committed Sep 11, 2024
1 parent d18c896 commit 1857ff0
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions crates/oxc_semantic/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -775,11 +775,11 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {

self.record_ast_nodes();
self.visit_expression(&stmt.test);
let test_node = self.retrieve_recorded_ast_node();
let test_node_id = self.retrieve_recorded_ast_node();

/* cfg */
control_flow!(self, |cfg| {
cfg.append_condition_to(start_of_condition_graph_ix, test_node);
cfg.append_condition_to(start_of_condition_graph_ix, test_node_id);
let end_of_condition_graph_ix = cfg.current_node_ix;

let end_do_while_graph_ix = cfg.new_basic_block_normal();
Expand Down Expand Up @@ -894,12 +894,12 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {

self.record_ast_nodes();
self.visit_expression(&expr.test);
let test_node = self.retrieve_recorded_ast_node();
let test_node_id = self.retrieve_recorded_ast_node();

/* cfg */
let (after_condition_graph_ix, before_consequent_expr_graph_ix) =
control_flow!(self, |cfg| {
cfg.append_condition_to(start_of_condition_graph_ix, test_node);
cfg.append_condition_to(start_of_condition_graph_ix, test_node_id);
let after_condition_graph_ix = cfg.current_node_ix;
// conditional expression basic block
let before_consequent_expr_graph_ix = cfg.new_basic_block_normal();
Expand Down Expand Up @@ -965,10 +965,10 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
if let Some(test) = &stmt.test {
self.record_ast_nodes();
self.visit_expression(test);
let test_node = self.retrieve_recorded_ast_node();
let test_node_id = self.retrieve_recorded_ast_node();

/* cfg */
control_flow!(self, |cfg| cfg.append_condition_to(test_graph_ix, test_node));
control_flow!(self, |cfg| cfg.append_condition_to(test_graph_ix, test_node_id));
/* cfg */
}

Expand Down Expand Up @@ -1026,14 +1026,14 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {

self.record_ast_nodes();
self.visit_expression(&stmt.right);
let right_node = self.retrieve_recorded_ast_node();
let right_node_id = self.retrieve_recorded_ast_node();

/* cfg */
let (end_of_prepare_cond_graph_ix, iteration_graph_ix, body_graph_ix) =
control_flow!(self, |cfg| {
let end_of_prepare_cond_graph_ix = cfg.current_node_ix;
let iteration_graph_ix = cfg.new_basic_block_normal();
cfg.append_iteration(right_node, IterationInstructionKind::In);
cfg.append_iteration(right_node_id, IterationInstructionKind::In);
let body_graph_ix = cfg.new_basic_block_normal();

cfg.ctx(None).default().allow_break().allow_continue();
Expand Down Expand Up @@ -1085,14 +1085,14 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {

self.record_ast_nodes();
self.visit_expression(&stmt.right);
let right_node = self.retrieve_recorded_ast_node();
let right_node_id = self.retrieve_recorded_ast_node();

/* cfg */
let (end_of_prepare_cond_graph_ix, iteration_graph_ix, body_graph_ix) =
control_flow!(self, |cfg| {
let end_of_prepare_cond_graph_ix = cfg.current_node_ix;
let iteration_graph_ix = cfg.new_basic_block_normal();
cfg.append_iteration(right_node, IterationInstructionKind::Of);
cfg.append_iteration(right_node_id, IterationInstructionKind::Of);
let body_graph_ix = cfg.new_basic_block_normal();
cfg.ctx(None).default().allow_break().allow_continue();
(end_of_prepare_cond_graph_ix, iteration_graph_ix, body_graph_ix)
Expand Down Expand Up @@ -1140,11 +1140,11 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {

self.record_ast_nodes();
self.visit_expression(&stmt.test);
let test_node = self.retrieve_recorded_ast_node();
let test_node_id = self.retrieve_recorded_ast_node();

/* cfg */
let (after_test_graph_ix, before_consequent_stmt_graph_ix) = control_flow!(self, |cfg| {
cfg.append_condition_to(start_of_condition_graph_ix, test_node);
cfg.append_condition_to(start_of_condition_graph_ix, test_node_id);
(cfg.current_node_ix, cfg.new_basic_block_normal())
});
/* cfg */
Expand Down Expand Up @@ -1332,8 +1332,8 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
if let Some(expr) = &case.test {
self.record_ast_nodes();
self.visit_expression(expr);
let test_node = self.retrieve_recorded_ast_node();
control_flow!(self, |cfg| cfg.append_condition_to(cfg.current_node_ix, test_node));
let test_node_id = self.retrieve_recorded_ast_node();
control_flow!(self, |cfg| cfg.append_condition_to(cfg.current_node_ix, test_node_id));
}

/* cfg */
Expand Down Expand Up @@ -1510,11 +1510,11 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {

self.record_ast_nodes();
self.visit_expression(&stmt.test);
let test_node = self.retrieve_recorded_ast_node();
let test_node_id = self.retrieve_recorded_ast_node();

/* cfg - body basic block */
let body_graph_ix = control_flow!(self, |cfg| {
cfg.append_condition_to(condition_graph_ix, test_node);
cfg.append_condition_to(condition_graph_ix, test_node_id);
let body_graph_ix = cfg.new_basic_block_normal();

cfg.ctx(None).default().allow_break().allow_continue();
Expand Down

0 comments on commit 1857ff0

Please sign in to comment.