Skip to content

Fix try-catch codegen #32

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
Dinnerbone merged 2 commits into from
May 2, 2026
Merged

Fix try-catch codegen #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54cdd1d
Update try_catch test with (broken) try{/*no throw*/}catch(){} examples
Dinnerbone May 2, 2026
d9cc3e1
Fix codegen for try-catch (jump to end after try statements)
Dinnerbone May 2, 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
1,154 changes: 857 additions & 297 deletions ...al/as2/lexer/snapshots/rascal__internal__as2__lexer__tests__all_samples@try_catch.as.snap
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions crates/rascal/src/internal/as2_codegen/statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,9 +697,10 @@ fn gen_get_url(
}

fn gen_try_catch(context: &mut ScriptContext, builder: &mut CodeBuilder, try_catch: &TryCatch) {
let mut end_label: Option<String> = None;
let mut end_label: Option<String> = Some(context.create_label());
let mut try_builder = CodeBuilder::new();
gen_statements(context, &mut try_builder, &try_catch.try_body);
try_builder.action(Action::Jump(end_label.clone().unwrap()));
let try_body = try_builder.into_actions();

let catch_body = if try_catch.typed_catches.is_empty() && try_catch.catch_all.is_none() {
Expand All @@ -720,7 +721,6 @@ fn gen_try_catch(context: &mut ScriptContext, builder: &mut CodeBuilder, try_cat
// Any number of typed catch blocks, with an optional catch-all block at the end
let mut catch_builder = CodeBuilder::new();
let catch_target = CatchTarget::Register(0);
end_label = Some(context.create_label());
let mut first = true;

for (type_name, catch) in &try_catch.typed_catches {
Expand Down
Loading