mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-08-05 21:43:55 +00:00
Code Issues 1 Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
J.-F. Cap 2019-03-14 03:39:16 +01:00 committed by Calvin Rose
parent 090c6ac975
commit c6a4485623
1 changed files with 52 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/core/bigint.c
View File

@ -43,29 +43,26 @@ static Janet int64_get(void *p, Janet key);
static Janet uint64_get(void *p, Janet key); static Janet uint64_get(void *p, Janet key);
static void int64_marshal(void *p, JanetMarshalContext *ctx) { static void int64_marshal(void *p, JanetMarshalContext *ctx) {
bi_int64 *box=(bi_int64 *)p; bi_int64 *box = (bi_int64 *)p;
janet_marshal_size(ctx,(size_t)(*box)); janet_marshal_size(ctx, (size_t)(*box));
} }
static void uint64_marshal(void *p, JanetMarshalContext *ctx) { static void uint64_marshal(void *p, JanetMarshalContext *ctx) {
bi_uint64 *box=(bi_uint64 *)p; bi_uint64 *box = (bi_uint64 *)p;
janet_marshal_size(ctx,(size_t)(*box)); janet_marshal_size(ctx, (size_t)(*box));
} }
static void int64_unmarshal(void *p, JanetMarshalContext *ctx) { static void int64_unmarshal(void *p, JanetMarshalContext *ctx) {
bi_int64 *box=(bi_int64 *)p; bi_int64 *box = (bi_int64 *)p;
janet_unmarshal_size(ctx,(size_t *)box); janet_unmarshal_size(ctx, (size_t *)box);
} }
static void uint64_unmarshal(void *p, JanetMarshalContext *ctx) { static void uint64_unmarshal(void *p, JanetMarshalContext *ctx) {
bi_uint64 *box=(bi_uint64 *)p; bi_uint64 *box = (bi_uint64 *)p;
janet_unmarshal_size(ctx,(size_t *)box); janet_unmarshal_size(ctx, (size_t *)box);
} }
static const JanetAbstractType bi_int64_type = { static const JanetAbstractType bi_int64_type = {
"core/int64", "core/int64",
NULL, NULL,
@ -109,67 +106,67 @@ static int parse_uint64(const char *str, bi_uint64 *box) {
} }
static bi_int64 check_bi_int64(Janet x) {
static Janet make_bi_int64(Janet x) {
bi_int64 *box = (bi_int64 *)janet_abstract(&bi_int64_type, sizeof(bi_int64));
switch (janet_type(x)) { switch (janet_type(x)) {
case JANET_NUMBER : { case JANET_NUMBER : {
double dbl = janet_unwrap_number(x); double dbl = janet_unwrap_number(x);
if (fabs(dbl) <= MAX_INT_IN_DBL) { if (fabs(dbl) <= MAX_INT_IN_DBL)
*box = (bi_int64)dbl; return (bi_int64)dbl;
return janet_wrap_abstract(box);
}
break; break;
} }
case JANET_STRING: case JANET_STRING: {
case JANET_SYMBOL: bi_int64 value;
case JANET_KEYWORD: { if (parse_int64((const char *)janet_unwrap_string(x), &value))
if (parse_int64((const char *)janet_unwrap_string(x), box)) return value;
return janet_wrap_abstract(box);
break; break;
} }
case JANET_ABSTRACT: { case JANET_ABSTRACT: {
void *abst = janet_unwrap_abstract(x); void *abst = janet_unwrap_abstract(x);
if ((janet_abstract_type(abst) == &bi_int64_type) || (janet_abstract_type(abst) == &bi_uint64_type)) { if ((janet_abstract_type(abst) == &bi_int64_type) || (janet_abstract_type(abst) == &bi_uint64_type))
*box = *(bi_int64 *)abst; return *(bi_int64 *)abst;
return janet_wrap_abstract(box);
}
break; break;
} }
} }
janet_panic("bad int64 initializer"); janet_panic("bad int64 initializer");
return janet_wrap_nil(); return 0;
} }
static Janet make_bi_uint64(Janet x) { static bi_uint64 check_bi_uint64(Janet x) {
bi_uint64 *box = (bi_uint64 *)janet_abstract(&bi_uint64_type, sizeof(bi_uint64));
switch (janet_type(x)) { switch (janet_type(x)) {
case JANET_NUMBER : { case JANET_NUMBER : {
double dbl = janet_unwrap_number(x); double dbl = janet_unwrap_number(x);
if ((dbl >= 0) && (dbl <= MAX_INT_IN_DBL)) { if ((dbl >= 0) && (dbl <= MAX_INT_IN_DBL))
*box = (bi_uint64)dbl; return (bi_uint64)dbl;
return janet_wrap_abstract(box);
}
break; break;
} }
case JANET_STRING: case JANET_STRING: {
case JANET_SYMBOL: bi_uint64 value;
case JANET_KEYWORD: { if (parse_uint64((const char *)janet_unwrap_string(x), &value))
if (parse_uint64((const char *)janet_unwrap_string(x), box)) return value;
return janet_wrap_abstract(box);
break; break;
} }
case JANET_ABSTRACT: { case JANET_ABSTRACT: {
void *abst = janet_unwrap_abstract(x); void *abst = janet_unwrap_abstract(x);
if (janet_abstract_type(abst) == &bi_uint64_type) { if (janet_abstract_type(abst) == &bi_uint64_type)
*box = *(bi_uint64 *)abst; return *(bi_uint64 *)abst;
return janet_wrap_abstract(box);
}
break; break;
} }
} }
janet_panic("bad uint64 initializer"); janet_panic("bad uint64 initializer");
return janet_wrap_nil(); return 0;
}
static Janet make_bi_int64(Janet x) {
bi_int64 *box = (bi_int64 *)janet_abstract(&bi_int64_type, sizeof(bi_int64));
*box = check_bi_int64(x);
return janet_wrap_abstract(box);
}
static Janet make_bi_uint64(Janet x) {
bi_uint64 *box = (bi_uint64 *)janet_abstract(&bi_uint64_type, sizeof(bi_uint64));
*box = check_bi_uint64(x);
return janet_wrap_abstract(box);
} }
@ -179,11 +176,6 @@ JanetBigintType janet_is_bigint(Janet x) {
return (at == &bi_int64_type) ? JANET_BIGINT_TYPE_int64 : ((at == &bi_uint64_type) ? JANET_BIGINT_TYPE_uint64 : JANET_BIGINT_TYPE_none); return (at == &bi_int64_type) ? JANET_BIGINT_TYPE_int64 : ((at == &bi_uint64_type) ? JANET_BIGINT_TYPE_uint64 : JANET_BIGINT_TYPE_none);
} }
static Janet janet_getbigint(Janet *argv, int32_t n, JanetBigintType type) {
Janet x = argv[n];
if (type == janet_is_bigint(x)) return x;
return make_bi_int64(x);
}
static Janet cfun_bi_int64_new(int32_t argc, Janet *argv) { static Janet cfun_bi_int64_new(int32_t argc, Janet *argv) {
janet_fixarity(argc, 1); janet_fixarity(argc, 1);
@ -197,23 +189,24 @@ static Janet cfun_bi_uint64_new(int32_t argc, Janet *argv) {
#define OPMETHOD(type,name,oper) \ #define OPMETHOD(type,name,oper) \
static Janet cfun_##type##_##name(int32_t argc, Janet *argv) { \ static Janet cfun_##type##_##name(int32_t argc, Janet *argv) { \
janet_arity(argc, 2, -1); \ janet_arity(argc, 2, -1); \
bi_##type *box = (bi_##type *)janet_abstract(&bi_##type##_type, sizeof(bi_##type)); \ bi_##type *box = (bi_##type *)janet_abstract(&bi_##type##_type, sizeof(bi_##type)); \
*box = *(bi_##type *)janet_unwrap_abstract(janet_getbigint(argv,0,JANET_BIGINT_TYPE_##type)); \ *box = check_bi_##type(argv[0]); \
for (int i=1;i<argc;i++) \ for (int i=1;i<argc;i++) \
*box oper##= *(bi_##type *)janet_unwrap_abstract(janet_getbigint(argv,i,JANET_BIGINT_TYPE_##type)); \ *box oper##= check_bi_##type(argv[i]); \
return janet_wrap_abstract(box); \ return janet_wrap_abstract(box); \
} }
#define COMPMETHOD(type,name,oper) \ #define COMPMETHOD(type,name,oper) \
static Janet cfun_##type##_##name(int32_t argc, Janet *argv) { \ static Janet cfun_##type##_##name(int32_t argc, Janet *argv) { \
janet_fixarity(argc, 2); \ janet_fixarity(argc, 2); \
bi_##type * box1 = (bi_##type *)janet_unwrap_abstract(janet_getbigint(argv,0,JANET_BIGINT_TYPE_##type)); \ bi_##type v1 = check_bi_##type(argv[0]); \
bi_##type * box2 = (bi_##type *)janet_unwrap_abstract(janet_getbigint(argv,1,JANET_BIGINT_TYPE_##type)); \ bi_##type v2 = check_bi_##type(argv[1]); \
return janet_wrap_boolean(*box1 oper *box2); \ return janet_wrap_boolean(v1 oper v2); \
} }
OPMETHOD(int64, add, +) OPMETHOD(int64, add, +)
OPMETHOD(int64, sub, -) OPMETHOD(int64, sub, -)
OPMETHOD(int64, mul, *) OPMETHOD(int64, mul, *)