Skip to content

Small changes for signal delivery in exception catchers. #222

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
jpco merged 2 commits into from
Aug 13, 2025
Merged

Small changes for signal delivery in exception catchers. #222

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
6f402d4
Small changes for signal delivery in exception catchers.
jpco Jul 29, 2025
220fc28
SIGCHK() inside of exception-handling loop
jpco Jul 31, 2025
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
2 changes: 2 additions & 0 deletions prim-ctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ PRIM(catch) {
EndExceptionHandler

EndExceptionHandler

SIGCHK();
} while (retry);
RefEnd(lp);
RefReturn(result);
Expand Down
29 changes: 29 additions & 0 deletions test/tests/trip.es
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,35 @@ never succeeded
}
}

test 'signals in exception catchers' {
local (signals = sigint) {
let (
was-blocked = false
thrown = ()
thrown2 = ()
) {
catch @ {
thrown = $*
} {
catch @ e {
kill -INT $pid
was-blocked = true
} {
throw exception
}
}
catch @ {
thrown2 = $*
} {
catch @ e {kill -INT $pid} {throw exception2}
}
assert $was-blocked signal is blocked during catcher
assert {~ $thrown(1) signal} signal exception during catcher is thrown
assert {~ $thrown2(1) signal} second signal is caught
}
}
}

test 'heredocs and herestrings' {
let (bigfile = `{mktemp big-file.XXXXXX})
unwind-protect {
Expand Down