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

Throw div-by-0 error

Browse source
This commit is contained in:
Justin Ethier 2015-07-15 21:34:05 -04:00
parent b6d4308e3e
commit cd91837f4a
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
runtime.c
View file

@ -1007,11 +1007,16 @@ object __halt(object obj) {
return nil; return nil;
} }
#define declare_num_op(FUNC, FUNC_OP, FUNC_APPLY, OP) \ #define declare_num_op(FUNC, FUNC_OP, FUNC_APPLY, OP, DIV) \
common_type FUNC_OP(object x, object y) { \ common_type FUNC_OP(object x, object y) { \
common_type s; \ common_type s; \
int tx = type_of(x), ty = type_of(y); \ int tx = type_of(x), ty = type_of(y); \
s.double_t.tag = double_tag; \ s.double_t.tag = double_tag; \
if (DIV && \
((ty == integer_tag && integer_value(y) == 0) || \
(ty == double_tag && double_value(y) == 0.0))) { \
Cyc_rt_raise_msg("Divide by zero"); \
} \
if (tx == integer_tag && ty == integer_tag) { \ if (tx == integer_tag && ty == integer_tag) { \
s.integer_t.tag = integer_tag; \ s.integer_t.tag = integer_tag; \
s.integer_t.value = ((integer_type *)x)->value OP ((integer_type *)y)->value; \ s.integer_t.value = ((integer_type *)x)->value OP ((integer_type *)y)->value; \
@ -1044,12 +1049,12 @@ void FUNC_APPLY(int argc, object clo, object cont, object n, ...) { \
return_funcall1(cont, &result); \ return_funcall1(cont, &result); \
} }
declare_num_op(Cyc_sum, Cyc_sum_op, dispatch_sum, +); declare_num_op(Cyc_sum, Cyc_sum_op, dispatch_sum, +, 0);
declare_num_op(Cyc_sub, Cyc_sub_op, dispatch_sub, -); declare_num_op(Cyc_sub, Cyc_sub_op, dispatch_sub, -, 0);
declare_num_op(Cyc_mul, Cyc_mul_op, dispatch_mul, *); declare_num_op(Cyc_mul, Cyc_mul_op, dispatch_mul, *, 0);
// TODO: what about divide-by-zero, and casting to double when // TODO: what about divide-by-zero, and casting to double when
// result contains a decimal component? // result contains a decimal component?
declare_num_op(Cyc_div, Cyc_div_op, dispatch_div, /); declare_num_op(Cyc_div, Cyc_div_op, dispatch_div, /, 1);
common_type Cyc_num_op_va_list(int argc, common_type (fn_op(object, object)), object n, va_list ns) { 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;