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

Fix compilation errors

Browse source
This commit is contained in:
Justin Ethier 2015-04-16 13:59:37 -04:00
parent 9a370aa532
commit ad14045446
1 changed files with 45 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
runtime.h
View file

@ -74,9 +74,11 @@ static string_type Cyc_string_append_va_list(int, object, va_list);
//static void dispatch_error(int argc, object clo, object cont, object obj1, ...);
//static object Cyc_error(int count, object obj1, ...);
//static object Cyc_error_va(int count, object obj1, va_list ap);
//object Cyc_raise(object);
static object Cyc_default_exception_handler(int argc, closure _, object err);
object Cyc_current_exception_handler();
static list mcons(object,object);
static object terpri(void);
//object Cyc_raise(object);
static object Cyc_display(object);
static object Cyc_write(object);
static object Cyc_is_boolean(object o);
@ -191,42 +193,6 @@ static void clear_mutations() {
}
/* END mutation table */
/* Exception handler */
static object Cyc_default_exception_handler(int argc, closure _, object err) {
printf("Error: ");
Cyc_display(err);
printf("\n");
exit(1);
return nil;
// TODO: need to avoid using a global here, or add a define to shadow it for libcyclone
object Cyc_current_exception_handler() {
if (nil(__glo__85exception_91handler_91stack_85)) {
return primitive_Cyc_91default_91exception_91handler;
} else {
return __glo__85exception_91handler_91stack_85;
}
}
/* Provide the ability to raise an exception from the C runtime.
Other runtime functions should call this as needed
TODO: consolidate this with (raise) in trans.scm ????
* /
TODO:
object Cyc_raise(object err) {
// TODO: probably best to re-arrange things to not rely on a global here
object ehs = (object) __glo__85exception_91handler_91stack_85;
if (boolean_f == ehs) {
Cyc_default_exception_handler(1, (closure)err, err);
} else {
// TODO: call into just like (raise) car(ehs)
}
return nil;
} */
/* END exception handler */
/* Global variables. */
static clock_t start; /* Starting time. */
@ -1266,6 +1232,48 @@ defprimitive(write, write, &_write); /* write */
defprimitive(display, display, &_display); /* display */
/* -------------------------------------------- */
/* Exception handler */
object Cyc_exception_handler_stack = nil;
// Special case, use this one instead since we need it in the runtime
#define __glo__85exception_91handler_91stack_85 Cyc_exception_handler_stack
static object Cyc_default_exception_handler(int argc, closure _, object err) {
printf("Error: ");
Cyc_display(err);
printf("\n");
exit(1);
return nil;
}
// TODO: need to avoid using a global here, or add a define to shadow it for libcyclone
object Cyc_current_exception_handler() {
if (nullp(Cyc_exception_handler_stack)) {
return primitive_Cyc_91default_91exception_91handler;
} else {
return car(Cyc_exception_handler_stack);
}
}
/* Provide the ability to raise an exception from the C runtime.
Other runtime functions should call this as needed
TODO: consolidate this with (raise) in trans.scm ????
* /
TODO:
object Cyc_raise(object err) {
// TODO: probably best to re-arrange things to not rely on a global here
object ehs = (object) __glo__85exception_91handler_91stack_85;
if (boolean_f == ehs) {
Cyc_default_exception_handler(1, (closure)err, err);
} else {
// TODO: call into just like (raise) car(ehs)
}
return nil;
} */
/* END exception handler */
/*
*
* @param cont - Continuation for the function to call into