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

Use a common numeric operation va_list function

Browse source
This commit is contained in:
Justin Ethier 2015-04-15 13:58:51 -04:00
parent 6cadac2be8
commit b51e3747e2
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
runtime.h
View file

@ -93,7 +93,7 @@ static object Cyc_is_eof_object(object o);
static object Cyc_is_cvar(object o); static object Cyc_is_cvar(object o);
static common_type Cyc_sum_op(object x, object y); static common_type Cyc_sum_op(object x, object y);
static common_type Cyc_sum(int argc, object n, ...); static common_type Cyc_sum(int argc, object n, ...);
static common_type Cyc_sum_va_list(int argc, object n, va_list ns); static common_type Cyc_num_op_va_list(int argc, common_type (fn_op(object, object)), object n, va_list ns);
static int equal(object,object); static int equal(object,object);
static list assq(object,list); static list assq(object,list);
static object get(object,object); static object get(object,object);
@ -827,7 +827,7 @@ static common_type Cyc_sum_op(object x, object y) {
return s; return s;
} }
static common_type Cyc_sum_va_list(int argc, object n, va_list ns) { static common_type Cyc_num_op_va_list(int argc, common_type (fn_op(object, object)), object n, va_list ns) {
common_type sum; common_type sum;
int i; int i;
if (argc == 0) { if (argc == 0) {
@ -848,7 +848,7 @@ static common_type Cyc_sum_va_list(int argc, object n, va_list ns) {
} }
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
common_type result = Cyc_sum_op(&sum, va_arg(ns, object)); common_type result = fn_op(&sum, va_arg(ns, object));
if (type_of(&result) == integer_tag) { if (type_of(&result) == integer_tag) {
sum.integer_t.tag = integer_tag; sum.integer_t.tag = integer_tag;
sum.integer_t.value = ((integer_type *) &result)->value; sum.integer_t.value = ((integer_type *) &result)->value;
@ -856,7 +856,7 @@ static common_type Cyc_sum_va_list(int argc, object n, va_list ns) {
sum.double_t.tag = double_tag; sum.double_t.tag = double_tag;
sum.double_t.value = ((double_type *) &result)->value; sum.double_t.value = ((double_type *) &result)->value;
} else { } else {
printf("Invalid tag in Cyc_sum_va_list\n"); printf("Invalid tag in Cyc_num_op_va_list\n");
exit(1); exit(1);
} }
} }
@ -867,16 +867,15 @@ static common_type Cyc_sum_va_list(int argc, object n, va_list ns) {
static common_type Cyc_sum(int argc, object n, ...) { static common_type Cyc_sum(int argc, object n, ...) {
va_list ap; va_list ap;
va_start(ap, n); va_start(ap, n);
common_type result = Cyc_sum_va_list(argc, n, ap); common_type result = Cyc_num_op_va_list(argc, Cyc_sum_op, n, ap);
va_end(ap); va_end(ap);
return result; return result;
} }
// TODO: (+ 1 2 3 4 1 34 2 5 2 -2 2 -10)
static void dispatch_sum(int argc, object clo, object cont, object n, ...) { static void dispatch_sum(int argc, object clo, object cont, object n, ...) {
va_list ap; va_list ap;
va_start(ap, n); va_start(ap, n);
common_type result = Cyc_sum_va_list(argc - 1, n, ap); common_type result = Cyc_num_op_va_list(argc - 1, Cyc_sum_op, n, ap);
va_end(ap); va_end(ap);
return_funcall1(cont, &result); return_funcall1(cont, &result);
} }