Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-19 05:39:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

runtime: distinguish exceptions and errors in default handler

Browse source
This commit is contained in:
Yorick Hardy 2025-02-16 17:50:25 +02:00
parent a77b641166
commit bb2b589b74
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
runtime.c
View file

@ -706,12 +706,13 @@ object Cyc_default_exception_handler(void *data, object _, int argc,
{
object err = args[0];
int is_msg = 1;
fprintf(stderr, "Error: ");
if ((err == NULL) || is_value_type(err) || type_of(err) != pair_tag || !Cyc_is_symbol(car(err))) {
if ((err == NULL) || is_value_type(err) || type_of(err) != pair_tag || type_of(car(err)) != symbol_tag) {
fprintf(stderr, "Exception: ");
Cyc_display(data, err, stderr);
} else {
if (strncmp(((symbol) car(err))->desc, "error", 5) == 0) {
fprintf(stderr, "Error: ");
// Error is list of form (type arg1 ... argn)
err = cdr(err); // skip type field
for (; (err != NULL); err = cdr(err)) { // output with no enclosing parens
@ -727,7 +728,7 @@ object Cyc_default_exception_handler(void *data, object _, int argc,
}
}
} else {
fprintf(stderr, "raised object: ");
fprintf(stderr, "Exception: ");
Cyc_display(data, cdr(err), stderr);
}
}