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

Added (error) to interpreter

Browse source
This commit is contained in:
Justin Ethier 2015-02-26 22:41:42 -05:00
parent 8e059f2315
commit 531fcca9b0
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
runtime.h
View file

@ -324,6 +324,9 @@ static void Cyc_apply(int argc, closure cont, object prim, ...);
static void dispatch_string_91append(int argc, object clo, object cont, object str1, ...); static void dispatch_string_91append(int argc, object clo, object cont, object str1, ...);
static string_type Cyc_string_append(int argc, object str1, ...); static string_type Cyc_string_append(int argc, object str1, ...);
static string_type Cyc_string_append_va_list(int, object, va_list); 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);
static list mcons(object,object); static list mcons(object,object);
static object terpri(void); static object terpri(void);
static object Cyc_display(object); static object Cyc_display(object);
@ -904,12 +907,24 @@ static void my_exit(env) closure env; {
#endif #endif
exit(0);} exit(0);}
static void dispatch_error(int argc, object clo, object cont, object obj1, ...) {
va_list ap;
va_start(ap, obj1);
Cyc_error_va(argc, obj1, ap);
va_end(ap); // Never get this far
}
static object Cyc_error(int count, object obj1, ...) { static object Cyc_error(int count, object obj1, ...) {
va_list ap; va_list ap;
va_start(ap, obj1);
Cyc_error_va(count, obj1, ap);
va_end(ap);
}
static object Cyc_error_va(int count, object obj1, va_list ap) {
object tmp; object tmp;
int i; int i;
va_start(ap, obj1);
printf("Error: "); printf("Error: ");
Cyc_display(obj1); Cyc_display(obj1);
printf("\n"); printf("\n");
@ -920,7 +935,6 @@ static object Cyc_error(int count, object obj1, ...) {
printf("\n"); printf("\n");
} }
va_end(ap);
exit(1); exit(1);
return boolean_f; return boolean_f;
} }
@ -1159,15 +1173,12 @@ static void _integer_91_125char(object cont, object args) {
static void _string_91_125number(object cont, object args) { static void _string_91_125number(object cont, object args) {
integer_type i = Cyc_string2number(car(args)); integer_type i = Cyc_string2number(car(args));
return_funcall1(cont, &i);} return_funcall1(cont, &i);}
static void _error(object cont, object args) {
// TODO: need to dispatch as varargs integer_type argc = Cyc_length(args);
// _error dispatch_va(argc.value, dispatch_error, cont, cont, args); }
//static void _error(object cont, object args) { return_funcall1(cont, );}
static void _string_91append(object cont, object args) { static void _string_91append(object cont, object args) {
integer_type argc = Cyc_length(args); integer_type argc = Cyc_length(args);
dispatch_va(argc.value, dispatch_string_91append, cont, cont, args); dispatch_va(argc.value, dispatch_string_91append, cont, cont, args); }
}
static void _string_91_125list(object cont, object args) { static void _string_91_125list(object cont, object args) {
string2list(lst, car(args)); string2list(lst, car(args));
return_funcall1(cont, &lst);} return_funcall1(cont, &lst);}
@ -1216,7 +1227,7 @@ defprimitive(_125_123, &missing_prim); /* >= */
defprimitive(_121_123, &missing_prim); /* <= */ defprimitive(_121_123, &missing_prim); /* <= */
defprimitive(apply, &_apply); /* apply */ defprimitive(apply, &_apply); /* apply */
defprimitive(_75halt, &missing_prim); /* %halt */ defprimitive(_75halt, &missing_prim); /* %halt */
defprimitive(error, &missing_prim); /* error */ defprimitive(error, &_error); /* error */
defprimitive(cons, &_cons); /* cons */ defprimitive(cons, &_cons); /* cons */
defprimitive(cell_91get, &missing_prim); /* cell-get */ defprimitive(cell_91get, &missing_prim); /* cell-get */
defprimitive(set_91global_67, &missing_prim); /* set-global! */ defprimitive(set_91global_67, &missing_prim); /* set-global! */