Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 1 addition & 15 deletions src/ast/initializers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,7 @@ impl AstBuilderImpl<'_> {
node.offset = object.offset;
node.cty = object.cty.clone();
}
for child in [
&mut node.lhs,
&mut node.rhs,
&mut node.cond,
&mut node.then,
&mut node.els,
&mut node.ini,
&mut node.upd,
]
.into_iter()
.flatten()
{
Self::resolve_deferred_local(child, offset, object);
}
for child in node.children.iter_mut().chain(&mut node.args) {
for child in node.child_nodes_mut() {
Self::resolve_deferred_local(child, offset, object);
}
node.refresh_arithmetic_type();
Expand Down
16 changes: 1 addition & 15 deletions src/ast/inline_calls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,7 @@ fn visit_direct_calls(node: &mut Node, operation: &mut impl FnMut(&mut String))
if node.nt == NodeType::CallFunc && node.lhs.is_none() {
operation(&mut node.global_name);
}
for child in [
&mut node.lhs,
&mut node.rhs,
&mut node.cond,
&mut node.then,
&mut node.els,
&mut node.ini,
&mut node.upd,
]
.into_iter()
.flatten()
{
visit_direct_calls(child, operation);
}
for child in node.children.iter_mut().chain(&mut node.args) {
for child in node.child_nodes_mut() {
visit_direct_calls(child, operation);
}
}
Expand Down
32 changes: 2 additions & 30 deletions src/ast/lowering.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,7 @@ impl AstBuilderImpl<'_> {
for ty in &mut node.parameter_types {
ty.lower_parameter_for_codegen();
}
for child in [
&mut node.lhs,
&mut node.rhs,
&mut node.cond,
&mut node.then,
&mut node.els,
&mut node.ini,
&mut node.upd,
]
.into_iter()
.flatten()
{
Self::lower_source_types(child);
}
for child in node.children.iter_mut().chain(&mut node.args) {
for child in node.child_nodes_mut() {
Self::lower_source_types(child);
}
}
Expand All @@ -50,21 +36,7 @@ impl AstBuilderImpl<'_> {
}

pub(super) fn insert_integer_conversions(node: &mut Node) {
for child in [
&mut node.lhs,
&mut node.rhs,
&mut node.cond,
&mut node.then,
&mut node.els,
&mut node.ini,
&mut node.upd,
]
.into_iter()
.flatten()
{
Self::insert_integer_conversions(child);
}
for child in node.children.iter_mut().chain(&mut node.args) {
for child in node.child_nodes_mut() {
Self::insert_integer_conversions(child);
}
if matches!(
Expand Down
16 changes: 1 addition & 15 deletions src/ast/overflow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,7 @@ impl AstBuilderImpl<'_> {
}

pub(super) fn lower(node: &mut Node, offset: &mut usize) {
for child in [
&mut node.lhs,
&mut node.rhs,
&mut node.cond,
&mut node.then,
&mut node.els,
&mut node.ini,
&mut node.upd,
]
.into_iter()
.flatten()
{
lower(child, offset);
}
for child in node.children.iter_mut().chain(&mut node.args) {
for child in node.child_nodes_mut() {
lower(child, offset);
}
if !matches!(node.nt, NodeType::AddOverflow | NodeType::SubOverflow) {
Expand Down
10 changes: 1 addition & 9 deletions src/ast/statement_expression.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,7 @@ impl AstBuilderImpl<'_> {
NodeType::While | NodeType::DoWhile | NodeType::For
));
let switches = switches + usize::from(node.nt == NodeType::Switch);
for child in [
&node.lhs, &node.rhs, &node.cond, &node.then, &node.els, &node.ini, &node.upd,
]
.into_iter()
.flatten()
{
self.validate_statement_expression_jumps(child, loops, switches);
}
for child in node.children.iter().chain(&node.args) {
for child in node.child_nodes() {
self.validate_statement_expression_jumps(child, loops, switches);
}
}
Expand Down
20 changes: 2 additions & 18 deletions src/ast/validation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,7 @@ impl AstBuilderImpl<'_> {
"external inline definition cannot refer to an internal identifier",
);
}
for child in [
&node.lhs, &node.rhs, &node.cond, &node.then, &node.els, &node.ini, &node.upd,
]
.into_iter()
.flatten()
{
self.validate_inline_body(child);
}
for child in node.children.iter().chain(&node.args) {
for child in node.child_nodes() {
self.validate_inline_body(child);
}
}
Expand Down Expand Up @@ -506,15 +498,7 @@ impl AstBuilderImpl<'_> {
);
}
}
for child in [
&node.lhs, &node.rhs, &node.cond, &node.then, &node.els, &node.ini, &node.upd,
]
.into_iter()
.flatten()
{
self.validate_void_expressions(child);
}
for child in node.children.iter().chain(&node.args) {
for child in node.child_nodes() {
self.validate_void_expressions(child);
}
}
Expand Down
42 changes: 3 additions & 39 deletions src/ast/vla.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,12 @@ fn block(children: Vec<Node>) -> Node {
}
fn walk(node: &Node, visitor: &mut impl FnMut(&Node)) {
visitor(node);
for child in [
&node.lhs, &node.rhs, &node.cond, &node.then, &node.els, &node.ini, &node.upd,
]
.into_iter()
.flatten()
{
walk(child, visitor);
}
for child in node.children.iter().chain(&node.args) {
for child in node.child_nodes() {
walk(child, visitor);
}
}
fn walk_mut(node: &mut Node, visitor: &mut impl FnMut(&mut Node)) {
for child in [
&mut node.lhs,
&mut node.rhs,
&mut node.cond,
&mut node.then,
&mut node.els,
&mut node.ini,
&mut node.upd,
]
.into_iter()
.flatten()
{
walk_mut(child, visitor);
}
for child in node.children.iter_mut().chain(&mut node.args) {
for child in node.child_nodes_mut() {
walk_mut(child, visitor);
}
visitor(node);
Expand Down Expand Up @@ -252,21 +230,7 @@ impl AstBuilderImpl<'_> {
// Report type changes so only ancestors of rewritten expressions need refreshing.
fn lower_variable_arithmetic_types(node: &mut Node) -> bool {
let mut changed = false;
for child in [
&mut node.lhs,
&mut node.rhs,
&mut node.cond,
&mut node.then,
&mut node.els,
&mut node.ini,
&mut node.upd,
]
.into_iter()
.flatten()
{
changed |= Self::lower_variable_arithmetic_types(child);
}
for child in node.children.iter_mut().chain(&mut node.args) {
for child in node.child_nodes_mut() {
changed |= Self::lower_variable_arithmetic_types(child);
}
if changed {
Expand Down
16 changes: 1 addition & 15 deletions src/bitfield.rs
Original file line number Diff line number Diff line change
Expand Up @@ -291,21 +291,7 @@ fn lower_with_type_changes(node: &mut Node, offset: &mut usize) -> bool {
return true;
}
let mut changed = false;
for child in [
&mut node.lhs,
&mut node.rhs,
&mut node.cond,
&mut node.then,
&mut node.els,
&mut node.ini,
&mut node.upd,
]
.into_iter()
.flatten()
{
changed |= lower_with_type_changes(child, offset);
}
for child in node.children.iter_mut().chain(&mut node.args) {
for child in node.child_nodes_mut() {
changed |= lower_with_type_changes(child, offset);
}
if node.bit_field.is_some() {
Expand Down
Loading
Loading