bignum/bignum equality

This commit is contained in:
Justin Ethier 2017-02-09 22:11:29 +00:00
parent 7c2bc7f514
commit 73a513f0c9

View file

@ -1169,19 +1169,19 @@ typedef enum {
, CYC_BN_GTE = 2 , CYC_BN_GTE = 2
} bn_cmp_type; } bn_cmp_type;
int Cyc_bignum_cmp(void *data, bn_tmp_type type, object x, int tx, object y, int ty) int Cyc_bignum_cmp(void *data, bn_cmp_type type, object x, int tx, object y, int ty)
{ {
int cmp; int cmp;
if (tx == bignum_tag && ty == bignum_tag) { if (tx == bignum_tag && ty == bignum_tag) {
cmp = mp_cmp(&bignum_value(x), &bignum_value(y)); cmp = mp_cmp(&bignum_value(x), &bignum_value(y));
// if cmp == type, return true return (cmp == type) ||
// otherwise need to check GTE / LTE ((type == CYC_BN_GTE && cmp > MP_LT) ||
(type == CYC_BN_LTE && cmp < MP_GT));
} }
/* TODO: /* TODO:
} else if (tx == bignum_tag && ty == -1) { \ } else if (tx == bignum_tag && ty == -1) { \
} else if (tx == bignum_tag && ty == double_tag) { \ } else if (tx == bignum_tag && ty == double_tag) { \
} else if (tx == bignum_tag && ty == bignum_tag) { \
} else if (tx == -1 && ty == bignum_tag) { \ } else if (tx == -1 && ty == bignum_tag) { \
} else if (tx == double_tag && ty == bignum_tag) { \ } else if (tx == double_tag && ty == bignum_tag) { \
*/ */
@ -1190,10 +1190,11 @@ int Cyc_bignum_cmp(void *data, bn_tmp_type type, object x, int tx, object y, int
make_pair(c1, y, NULL); make_pair(c1, y, NULL);
make_pair(c0, &s, &c1); make_pair(c0, &s, &c1);
Cyc_rt_raise(data, &c0); Cyc_rt_raise(data, &c0);
return 0;
} }
} }
#define declare_num_cmp(FUNC, FUNC_OP, FUNC_FAST_OP, FUNC_APPLY, OP) \ #define declare_num_cmp(FUNC, FUNC_OP, FUNC_FAST_OP, FUNC_APPLY, OP, BN_CMP) \
int FUNC_OP(void *data, object x, object y) { \ 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)), \
@ -1219,6 +1220,7 @@ int FUNC_OP(void *data, object x, object y) { \
} else if (tx == bignum_tag && ty == -1) { \ } else if (tx == bignum_tag && ty == -1) { \
} else if (tx == bignum_tag && ty == double_tag) { \ } else if (tx == bignum_tag && ty == double_tag) { \
} else if (tx == bignum_tag && ty == bignum_tag) { \ } else if (tx == bignum_tag && ty == bignum_tag) { \
result = Cyc_bignum_cmp(data, BN_CMP, x, tx, y, ty); \
} else if (tx == -1 && ty == bignum_tag) { \ } else if (tx == -1 && ty == bignum_tag) { \
} else if (tx == double_tag && ty == bignum_tag) { \ } else if (tx == double_tag && ty == bignum_tag) { \
} else { \ } else { \
@ -1303,11 +1305,11 @@ bad_arg_type_error: \
} \ } \
} }
declare_num_cmp(Cyc_num_eq, Cyc_num_eq_op, Cyc_num_fast_eq_op, dispatch_num_eq, ==); declare_num_cmp(Cyc_num_eq, Cyc_num_eq_op, Cyc_num_fast_eq_op, dispatch_num_eq, ==, CYC_BN_EQ);
declare_num_cmp(Cyc_num_gt, Cyc_num_gt_op, Cyc_num_fast_gt_op, dispatch_num_gt, >); declare_num_cmp(Cyc_num_gt, Cyc_num_gt_op, Cyc_num_fast_gt_op, dispatch_num_gt, >, CYC_BN_GT);
declare_num_cmp(Cyc_num_lt, Cyc_num_lt_op, Cyc_num_fast_lt_op, dispatch_num_lt, <); declare_num_cmp(Cyc_num_lt, Cyc_num_lt_op, Cyc_num_fast_lt_op, dispatch_num_lt, <, CYC_BN_LT);
declare_num_cmp(Cyc_num_gte, Cyc_num_gte_op, Cyc_num_fast_gte_op, dispatch_num_gte, >=); declare_num_cmp(Cyc_num_gte, Cyc_num_gte_op, Cyc_num_fast_gte_op, dispatch_num_gte, >=, CYC_BN_GTE);
declare_num_cmp(Cyc_num_lte, Cyc_num_lte_op, Cyc_num_fast_lte_op, dispatch_num_lte, <=); declare_num_cmp(Cyc_num_lte, Cyc_num_lte_op, Cyc_num_fast_lte_op, dispatch_num_lte, <=, CYC_BN_LTE);
object Cyc_is_boolean(object o) object Cyc_is_boolean(object o)
{ {