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

Bug fixes for num comparisons

Browse source
This commit is contained in:
Justin Ethier 2016-04-05 23:20:01 -04:00
parent 67f73d1d8a
commit c9326fc8c4
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
runtime.c
View file

@ -775,9 +775,11 @@ object Cyc_num_cmp_va_list(void *data, int argc, int (fn_op(void *, object, obje
if (argc < 2) { if (argc < 2) {
Cyc_rt_raise_msg(data, "Not enough arguments for boolean operator\n"); Cyc_rt_raise_msg(data, "Not enough arguments for boolean operator\n");
} }
Cyc_check_num(data, n);
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
next = va_arg(ns, object); next = va_arg(ns, object);
Cyc_check_num(data, next);
if (!fn_op(data, n, next)) { if (!fn_op(data, n, next)) {
return boolean_f; return boolean_f;
} }
@ -792,24 +794,24 @@ int FUNC_OP(void *data, object x, object y) { \
int result = 0, \ int result = 0, \
tx = (obj_is_int(x) ? -1 : type_of(x)), \ tx = (obj_is_int(x) ? -1 : type_of(x)), \
ty = (obj_is_int(y) ? -1 : type_of(y)); \ ty = (obj_is_int(y) ? -1 : type_of(y)); \
if (tx == -1 && ty == -1) { \ if (tx == -1 && ty == -1) { \
result = (obj_obj2int(x)) OP (obj_obj2int(y)); \ result = (obj_obj2int(x)) OP (obj_obj2int(y)); \
} else if (tx == -1 && ty == integer_tag) { \ } else if (tx == -1 && ty == integer_tag) { \
result = (obj_obj2int(x)) OP (integer_value(y)); \ result = (obj_obj2int(x)) OP (integer_value(y)); \
} else if (tx == -1 && ty == double_tag) { \ } else if (tx == -1 && ty == double_tag) { \
result = (obj_obj2int(x)) OP (double_value(y)); \ result = (obj_obj2int(x)) OP (double_value(y)); \
} else if (tx == integer_tag && ty == -1) { \ } else if (tx == integer_tag && ty == -1) { \
result = (integer_value(x)) OP (obj_obj2int(y)); \ result = (integer_value(x)) OP (obj_obj2int(y)); \
} else if (tx == integer_tag && ty == integer_tag) { \ } else if (tx == integer_tag && ty == integer_tag) { \
result = (integer_value(x)) OP (integer_value(y)); \ result = (integer_value(x)) OP (integer_value(y)); \
} else if (tx == integer_tag && ty == double_tag) { \ } else if (tx == integer_tag && ty == double_tag) { \
result = (integer_value(x)) OP (double_value(y)); \ result = (integer_value(x)) OP (double_value(y)); \
} else if (tx == double_tag && ty == -1) { \ } else if (tx == double_tag && ty == -1) { \
result = (double_value(x)) OP (obj_obj2int(y)); \ result = (double_value(x)) OP (obj_obj2int(y)); \
} else if (tx == double_tag && ty == integer_tag) { \ } else if (tx == double_tag && ty == integer_tag) { \
result = (double_value(x)) OP (integer_value(y)); \ result = (double_value(x)) OP (integer_value(y)); \
} else if (tx == double_tag && ty == double_tag) { \ } else if (tx == double_tag && ty == double_tag) { \
result = (double_value(x)) OP (double_value(y)); \ result = (double_value(x)) OP (double_value(y)); \
} else { \ } else { \
make_string(s, "Bad argument type"); \ make_string(s, "Bad argument type"); \
make_cons(c1, y, nil); \ make_cons(c1, y, nil); \