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

Require num_args for primitive_type

Browse source 
This will allow us to use the same validation code as for closures.
This commit is contained in:
Justin Ethier 2021-05-24 12:35:50 -04:00
parent a05959cb90
commit 8526a0676f
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/cyclone/types.h
View file

@ -1471,6 +1471,7 @@ typedef struct {
gc_header_type hdr; gc_header_type hdr;
tag_type tag; tag_type tag;
function_type fn; function_type fn;
int num_args;
const char *desc; const char *desc;
} primitive_type; } primitive_type;
typedef primitive_type *primitive; typedef primitive_type *primitive;

12
runtime.c
View file

@ -5794,27 +5794,23 @@ object apply(void *data, object cont, object func, object args)
switch (type_of(func)) { switch (type_of(func)) {
case primitive_tag: case primitive_tag:
TODO: fn function signature changed, need to convert from list to array
((primitive_type *) func)->fn(data, cont, args);
break;
case macro_tag: case macro_tag:
case closure0_tag: case closure0_tag:
case closure1_tag: case closure1_tag:
case closureN_tag: case closureN_tag:
count = Cyc_length(data, args);
if (func == Cyc_glo_call_cc) { if (func == Cyc_glo_call_cc) {
// make_pair(c, cont, args); // make_pair(c, cont, args);
//Cyc_display(data, args, stderr); //Cyc_display(data, args, stderr);
// args = &c; // args = &c;
//Cyc_display(data, &c, stderr); //Cyc_display(data, &c, stderr);
count = Cyc_length(data, args);
Cyc_check_num_args(data, "<procedure>", 1, args); Cyc_check_num_args(data, "<procedure>", 1, args);
dispatch(data, obj_obj2int(count), ((closure) func)->fn, func, cont, dispatch(data, obj_obj2int(count), ((closure) func)->fn, func, cont,
args); args);
} else {
Cyc_check_num_args(data, "<procedure>", ((closure) func)->num_args, args); // TODO: could be more efficient, eg: cyc_length(args) is called twice.
dispatch(data, obj_obj2int(count), ((closure) func)->fn, func, cont, args);
} }
count = Cyc_length(data, args);
// TODO: validate number of args provided:
Cyc_check_num_args(data, "<procedure>", ((closure) func)->num_args, args); // TODO: could be more efficient, eg: cyc_length(args) is called twice.
dispatch(data, obj_obj2int(count), ((closure) func)->fn, func, cont, args);
break; break;
case pair_tag: case pair_tag: