Skip to content

Fix: boa_cli returns non-zero exit code on uncaught exceptions #5345

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

Closed
Pantkartik wants to merge 1 commit into from
Closed

Fix: boa_cli returns non-zero exit code on uncaught exceptions #5345

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
61 changes: 36 additions & 25 deletions cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,33 +410,42 @@ fn evaluate_expr(
Ok(v) => println!("{v}"),
Err(v) => eprintln!("{v:?}"),
}
} else {
let mut counters = Counters::new(args.time);
let script = {
let _timer = counters.new_timer("Parsing");
Script::parse(Source::from_bytes(line), None, context)
};
return Ok(());
}

match script {
Ok(script) => {
let result = {
let _timer = counters.new_timer("Execution");
let result = script.evaluate(context);
if let Err(err) = context.run_jobs() {
printer.print(uncaught_job_error(&err));
}
result
};
match result {
Ok(v) => printer.print(format!("{}\n", v.display())),
Err(ref v) => printer.print(uncaught_error(v)),
let mut counters = Counters::new(args.time);
let script = {
let _timer = counters.new_timer("Parsing");
Script::parse(Source::from_bytes(line), None, context)
};

match script {
Ok(script) => {
let result = {
let _timer = counters.new_timer("Execution");
let result = script.evaluate(context);
if let Err(err) = context.run_jobs() {
printer.print(uncaught_job_error(&err));
return Err(eyre!("Job evaluation failed"));
}
result
};
match result {
Ok(v) => {
printer.print(format!("{}\n", v.display()));
Ok(())
}
Err(ref v) => {
printer.print(uncaught_error(v));
Err(eyre!("Expression execution failed"))
}
}
Err(ref v) => printer.print(uncaught_error(v)),
}
Err(ref v) => {
printer.print(uncaught_error(v));
Err(eyre!("Parsing failed"))
}
}

Ok(())
}

fn evaluate_file(
Expand Down Expand Up @@ -518,11 +527,13 @@ fn evaluate_file(
if !v.is_undefined() {
println!("{}", v.display());
}
Ok(())
}
Err(v) => {
printer.print(uncaught_error(&v));
Err(eyre!("Script execution failed"))
}
Err(v) => printer.print(uncaught_error(&v)),
}

Ok(())
}

fn evaluate_files(
Expand Down