Skip to content

refactor(interpreter): extract LoopAccumulator for errexit suppression tracking #896

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

Merged
chaliy merged 4 commits into from
Mar 28, 2026
+210 −175
Merged

refactor(interpreter): extract LoopAccumulator for errexit suppression tracking #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7105cdf
refactor(interpreter): extract LoopAccumulator for errexit suppressio…
chaliy Mar 28, 2026
1214901
ci: retrigger CI (Audit failure unrelated to refactor)
chaliy Mar 28, 2026
cba35be
ci: retry (transient crates.io 503)
chaliy Mar 28, 2026
42fb0db
chore(deps): add cargo-vet exemption for rustc-hash 2.1.2
chaliy Mar 28, 2026
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
197 changes: 22 additions & 175 deletions crates/bashkit/src/interpreter/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1458,10 +1458,7 @@ impl Interpreter {
));
}

let mut stdout = String::new();
let mut stderr = String::new();
let mut exit_code = 0;
let mut last_errexit_suppressed = false;
let mut acc = state::LoopAccumulator::new();

// Get iteration values: expand fields, then apply brace/glob expansion
let values: Vec<String> = if let Some(words) = &for_cmd.words {
Expand Down Expand Up @@ -1514,65 +1511,15 @@ impl Interpreter {
let emit_before = self.output_emit_count;
let result = self.execute_command_sequence(&for_cmd.body).await?;
self.maybe_emit_output(&result.stdout, &result.stderr, emit_before);
stdout.push_str(&result.stdout);
stderr.push_str(&result.stderr);
exit_code = result.exit_code;
last_errexit_suppressed = result.errexit_suppressed;

// Check for break/continue
match result.control_flow {
ControlFlow::Break(n) => {
if n <= 1 {
break;
} else {
// Propagate break with decremented count
return Ok(ExecResult {
stdout,
stderr,
exit_code,
control_flow: ControlFlow::Break(n - 1),
..Default::default()
});
}
}
ControlFlow::Continue(n) => {
if n <= 1 {
continue;
} else {
// Propagate continue with decremented count
return Ok(ExecResult {
stdout,
stderr,
exit_code,
control_flow: ControlFlow::Continue(n - 1),
..Default::default()
});
}
}
ControlFlow::Return(code) => {
// Propagate return
return Ok(ExecResult {
stdout,
stderr,
exit_code: code,
control_flow: ControlFlow::Return(code),
..Default::default()
});
}
ControlFlow::None => {
// errexit is already handled by execute_command_sequence_impl
}
match acc.accumulate(result) {
state::LoopAction::None => {}
state::LoopAction::Break => break,
state::LoopAction::Continue => continue,
state::LoopAction::Exit(r) => return Ok(r),
}
}

Ok(ExecResult {
stdout,
stderr,
exit_code,
control_flow: ControlFlow::None,
errexit_suppressed: last_errexit_suppressed,
..Default::default()
})
Ok(acc.finish())
}

/// Execute a select loop: select var in list; do body; done
Expand Down Expand Up @@ -1752,10 +1699,7 @@ impl Interpreter {
&mut self,
arith_for: &ArithmeticForCommand,
) -> Result<ExecResult> {
let mut stdout = String::new();
let mut stderr = String::new();
let mut exit_code = 0;
let mut last_errexit_suppressed = false;
let mut acc = state::LoopAccumulator::new();

// Execute initialization
if !arith_for.init.is_empty() {
Expand All @@ -1781,50 +1725,10 @@ impl Interpreter {
let emit_before = self.output_emit_count;
let result = self.execute_command_sequence(&arith_for.body).await?;
self.maybe_emit_output(&result.stdout, &result.stderr, emit_before);
stdout.push_str(&result.stdout);
stderr.push_str(&result.stderr);
exit_code = result.exit_code;
last_errexit_suppressed = result.errexit_suppressed;

// Check for break/continue
match result.control_flow {
ControlFlow::Break(n) => {
if n <= 1 {
break;
} else {
return Ok(ExecResult {
stdout,
stderr,
exit_code,
control_flow: ControlFlow::Break(n - 1),
..Default::default()
});
}
}
ControlFlow::Continue(n) => {
if n > 1 {
return Ok(ExecResult {
stdout,
stderr,
exit_code,
control_flow: ControlFlow::Continue(n - 1),
..Default::default()
});
}
// n <= 1: continue to next iteration (after step)
}
ControlFlow::Return(code) => {
return Ok(ExecResult {
stdout,
stderr,
exit_code: code,
control_flow: ControlFlow::Return(code),
..Default::default()
});
}
ControlFlow::None => {
// errexit is already handled by execute_command_sequence_impl
}
match acc.accumulate(result) {
state::LoopAction::None | state::LoopAction::Continue => {}
state::LoopAction::Break => break,
state::LoopAction::Exit(r) => return Ok(r),
}

// Execute step
Expand All @@ -1833,14 +1737,7 @@ impl Interpreter {
}
}

Ok(ExecResult {
stdout,
stderr,
exit_code,
control_flow: ControlFlow::None,
errexit_suppressed: last_errexit_suppressed,
..Default::default()
})
Ok(acc.finish())
}

/// Execute an arithmetic command ((expression))
Expand Down Expand Up @@ -2187,10 +2084,7 @@ impl Interpreter {
body: &[Command],
break_on_zero: bool,
) -> Result<ExecResult> {
let mut stdout = String::new();
let mut stderr = String::new();
let mut exit_code = 0;
let mut last_errexit_suppressed = false;
let mut acc = state::LoopAccumulator::new();

// Reset loop counter for this loop
self.counters.reset_loop();
Expand All @@ -2208,8 +2102,8 @@ impl Interpreter {
&condition_result.stderr,
emit_before_cond,
);
stdout.push_str(&condition_result.stdout);
stderr.push_str(&condition_result.stderr);
acc.stdout.push_str(&condition_result.stdout);
acc.stderr.push_str(&condition_result.stderr);
let should_break = if break_on_zero {
condition_result.exit_code == 0
} else {
Expand All @@ -2223,62 +2117,15 @@ impl Interpreter {
let emit_before = self.output_emit_count;
let result = self.execute_command_sequence(body).await?;
self.maybe_emit_output(&result.stdout, &result.stderr, emit_before);
stdout.push_str(&result.stdout);
stderr.push_str(&result.stderr);
exit_code = result.exit_code;
last_errexit_suppressed = result.errexit_suppressed;

// Check for break/continue
match result.control_flow {
ControlFlow::Break(n) => {
if n <= 1 {
break;
} else {
return Ok(ExecResult {
stdout,
stderr,
exit_code,
control_flow: ControlFlow::Break(n - 1),
..Default::default()
});
}
}
ControlFlow::Continue(n) => {
if n <= 1 {
continue;
} else {
return Ok(ExecResult {
stdout,
stderr,
exit_code,
control_flow: ControlFlow::Continue(n - 1),
..Default::default()
});
}
}
ControlFlow::Return(code) => {
return Ok(ExecResult {
stdout,
stderr,
exit_code: code,
control_flow: ControlFlow::Return(code),
..Default::default()
});
}
ControlFlow::None => {
// errexit is already handled by execute_command_sequence_impl
}
match acc.accumulate(result) {
state::LoopAction::None => {}
state::LoopAction::Break => break,
state::LoopAction::Continue => continue,
state::LoopAction::Exit(r) => return Ok(r),
}
}

Ok(ExecResult {
stdout,
stderr,
exit_code,
control_flow: ControlFlow::None,
errexit_suppressed: last_errexit_suppressed,
..Default::default()
})
Ok(acc.finish())
}

/// Execute a case statement
Expand Down
Loading
Loading