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

WIP

Browse source
This commit is contained in:
Justin Ethier 2017-02-13 16:47:38 +00:00
parent c66f31cacd
commit 58d5c47486
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/cyclone/types.h
View file

@ -372,6 +372,13 @@ typedef struct {
mp_init(&(n.bn)); mp_init(&(n.bn));
/* TODO: check return value of mp_init */ /* TODO: check return value of mp_init */
#define init_empty_bignum(n) \
n.hdr.mark = gc_color_red; \
n.hdr.grayed = 0; \
n.tag = bignum_tag; \
mp_init(&(n.bn));
/* TODO: check return value of mp_init */
typedef struct { typedef struct {
gc_header_type hdr; gc_header_type hdr;
tag_type tag; tag_type tag;

18
runtime.c
View file

@ -1227,11 +1227,6 @@ int Cyc_bignum_cmp(void *data, bn_cmp_type type, object x, int tx, object y, int
((type == CYC_BN_GTE && cmp > MP_LT) || ((type == CYC_BN_GTE && cmp > MP_LT) ||
(type == CYC_BN_LTE && cmp < MP_GT)); (type == CYC_BN_LTE && cmp < MP_GT));
} }
/* TODO:
} else if (tx == bignum_tag && ty == double_tag) { \
} else if (tx == double_tag && ty == bignum_tag) { \
*/
{ {
make_string(s, "Bad argument type"); make_string(s, "Bad argument type");
make_pair(c1, y, NULL); make_pair(c1, y, NULL);
@ -2497,6 +2492,7 @@ static int Cyc_checked_mul(int x, int y, int *result)
#define declare_num_op(FUNC, FUNC_OP, FUNC_APPLY, OP, INT_OP, NO_ARG, ONE_ARG, DIV) \ #define declare_num_op(FUNC, FUNC_OP, FUNC_APPLY, OP, INT_OP, NO_ARG, ONE_ARG, DIV) \
object FUNC_OP(void *data, common_type *x, object y) { \ object FUNC_OP(void *data, common_type *x, object y) { \
mp_int bn_tmp; \
int tx, ty; \ int tx, ty; \
tx = type_of(x); \ tx = type_of(x); \
if (obj_is_int(y)) { \ if (obj_is_int(y)) { \
@ -2534,9 +2530,19 @@ object FUNC_OP(void *data, common_type *x, object y) { \
} else if (tx == double_tag && ty == double_tag) { \ } else if (tx == double_tag && ty == double_tag) { \
x->double_t.value = x->double_t.value OP ((double_type *)y)->value; \ x->double_t.value = x->double_t.value OP ((double_type *)y)->value; \
} else if (tx == integer_tag && ty == bignum_tag) { \ } else if (tx == integer_tag && ty == bignum_tag) { \
} else if (tx == integer_tag && ty == double_tag) { \ } else if (tx == double_tag && ty == bignum_tag) { \
x->double_t.value = x->double_t.value OP mp_get_double(&bignum_value(y)); \
} else if (tx == bignum_tag && ty == -1) { \ } else if (tx == bignum_tag && ty == -1) { \
mp_int tmp2; \
mp_init(&tmp2); \
mp_set_int(&tmp2, obj_obj2int(y)); \
mp_init_copy(&bn_tmp, &(x->bignum_t.bn)); \
mp_add(&bn_tmp, &tmp2, &(x->bignum_t.bn)); \
} else if (tx == bignum_tag && ty == double_tag) { \ } else if (tx == bignum_tag && ty == double_tag) { \
x->double_t.hdr.mark = gc_color_red; \
x->double_t.hdr.grayed = 0; \
x->double_t.tag = double_tag; \
x->double_t.value = mp_get_double(&(x->bignum_t.bn)) OP ((double_type *)y)->value; \
} else if (tx == bignum_tag && ty == bignum_tag) { \ } else if (tx == bignum_tag && ty == bignum_tag) { \
} else { \ } else { \
goto bad_arg_type_error; \ goto bad_arg_type_error; \