Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-09 14:07:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Alias call/cc and eval globals

Browse source
This commit is contained in:
Justin Ethier 2015-05-07 21:19:29 -04:00
parent 836725a88f
commit 2c6ac71fb8
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
runtime.c
View file

@ -148,6 +148,10 @@ void clear_mutations() {
} }
/* END mutation table */ /* END mutation table */
/* Runtime globals */
object Cyc_glo_call_cc = nil;
object Cyc_glo_eval = nil;
/* Exception handler */ /* Exception handler */
object Cyc_exception_handler_stack = nil; object Cyc_exception_handler_stack = nil;
@ -1070,16 +1074,9 @@ void _write(object cont, object args) {
return_funcall1(cont, Cyc_write(car(args))); } return_funcall1(cont, Cyc_write(car(args))); }
void _display(object cont, object args) { void _display(object cont, object args) {
return_funcall1(cont, Cyc_display(car(args)));} return_funcall1(cont, Cyc_display(car(args)));}
void _call_95cc(object cont, object args){
// JAE TODO: need to refactor cyc_eval out of here,
// and use #define's to mask global (IE, use another
// runtime global and have the __glo_ expand into it
#ifdef CYC_EVAL
static void _call_95cc(object cont, object args){
return_funcall2(__glo_call_95cc, cont, car(args)); return_funcall2(__glo_call_95cc, cont, car(args));
} }
defprimitive(call_95cc, call/cc, &_call_95cc); // Moved up here due to ifdef
#endif /* CYC_EVAL */
/* /*
* @param cont - Continuation for the function to call into * @param cont - Continuation for the function to call into
@ -1113,7 +1110,6 @@ object apply(object cont, object func, object args){
dispatch(buf.integer_t.value, ((closure)func)->fn, func, cont, args); dispatch(buf.integer_t.value, ((closure)func)->fn, func, cont, args);
break; break;
#ifdef CYC_EVAL
case cons_tag: case cons_tag:
{ {
make_cons(c, func, args); make_cons(c, func, args);
@ -1127,7 +1123,6 @@ object apply(object cont, object func, object args){
exit(1); exit(1);
} }
} }
#endif /* CYC_EVAL */
default: default:
printf("Invalid object type %ld\n", type_of(func)); printf("Invalid object type %ld\n", type_of(func));
@ -1729,6 +1724,8 @@ static primitive_type read_91char_primitive = {primitive_tag, "read-char", &_rea
static primitive_type peek_91char_primitive = {primitive_tag, "peek-char", &_peek_91char}; static primitive_type peek_91char_primitive = {primitive_tag, "peek-char", &_peek_91char};
static primitive_type write_primitive = {primitive_tag, "write", &_write}; static primitive_type write_primitive = {primitive_tag, "write", &_write};
static primitive_type display_primitive = {primitive_tag, "display", &_display}; static primitive_type display_primitive = {primitive_tag, "display", &_display};
static primitive_type call_95cc_primitive = {primitive_tag, "call/cc", &_call_95cc};
const object primitive_Cyc_91global_91vars = &Cyc_91global_91vars_primitive; const object primitive_Cyc_91global_91vars = &Cyc_91global_91vars_primitive;
const object primitive_Cyc_91get_91cvar = &Cyc_91get_91cvar_primitive; const object primitive_Cyc_91get_91cvar = &Cyc_91get_91cvar_primitive;
const object primitive_Cyc_91set_91cvar_67 = &Cyc_91set_91cvar_67_primitive; const object primitive_Cyc_91set_91cvar_67 = &Cyc_91set_91cvar_67_primitive;
@ -1822,4 +1819,5 @@ const object primitive_read_91char = &read_91char_primitive;
const object primitive_peek_91char = &peek_91char_primitive; const object primitive_peek_91char = &peek_91char_primitive;
const object primitive_write = &write_primitive; const object primitive_write = &write_primitive;
const object primitive_display = &display_primitive; const object primitive_display = &display_primitive;
const object primitive_call_95cc = &call_95cc_primitive;

8
runtime.h
View file

@ -278,8 +278,16 @@ extern const object primitive_read_91char;
extern const object primitive_peek_91char; extern const object primitive_peek_91char;
extern const object primitive_write; extern const object primitive_write;
extern const object primitive_display; extern const object primitive_display;
extern const object primitive_call_95cc;
/* -------------------------------------------- */ /* -------------------------------------------- */
/* Globals that are needed by the runtime */
extern object Cyc_glo_eval;
extern object Cyc_glo_call_cc;
#define __glo_eval Cyc_glo_eval
#define __glo_call_95cc Cyc_glo_call_cc
/* Exception handler */ /* Exception handler */
extern object Cyc_exception_handler_stack; extern object Cyc_exception_handler_stack;