Miroirs/skint
1
0
Fork 0
mirror of https://github.com/false-schemers/skint.git synced 2025-01-22 19:27:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

quotient, remainder improved

Browse source
This commit is contained in:
ESL 2023-04-03 11:31:56 -04:00
parent e71a8bde52
commit c9beba483d
1 changed files with 35 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
i.c
View file

@ -2006,12 +2006,6 @@ define_instruction(jdiv) {
gonexti(); gonexti();
} }
define_instruction(jrem) {
obj x = ac, y = spop(); ckj(x); ckj(y);
ac = flonum_obj(flrem(get_flonum(x), get_flonum(y)));
gonexti();
}
define_instruction(jlt) { define_instruction(jlt) {
obj x = ac, y = spop(); ckj(x); ckj(y); obj x = ac, y = spop(); ckj(x); ckj(y);
ac = bool_obj(get_flonum(x) < get_flonum(y)); ac = bool_obj(get_flonum(x) < get_flonum(y));
@ -2097,11 +2091,21 @@ define_instruction(jtoi) {
} }
define_instruction(jquo) { define_instruction(jquo) {
obj x = ac, y = spop(); ckj(x); ckj(y); obj x = ac, y = spop(); double n, d, i;
ac = flonum_obj(flquo(get_flonum(x), get_flonum(y))); ckj(x); ckj(y);
n = get_flonum(x), d = get_flonum(y); modf(n/d, &i);
ac = flonum_obj(i);
gonexti(); gonexti();
} }
define_instruction(jrem) {
/* NB: we keep sign: (flremainder -10.0 2.0) => -0.0 */
obj x = ac, y = spop(); ckj(x); ckj(y);
ac = flonum_obj(fmod(get_flonum(x), get_flonum(y)));
gonexti();
}
define_instruction(jmqu) { define_instruction(jmqu) {
obj x = ac, y = spop(); ckj(x); ckj(y); obj x = ac, y = spop(); ckj(x); ckj(y);
ac = flonum_obj(flmqu(get_flonum(x), get_flonum(y))); ac = flonum_obj(flmqu(get_flonum(x), get_flonum(y)));
@ -2127,9 +2131,8 @@ define_instruction(jceil) {
} }
define_instruction(jtrunc) { define_instruction(jtrunc) {
double f, i; ckj(ac); double i; ckj(ac);
f = get_flonum(ac); modf(get_flonum(ac), &i);
modf(f, &i);
ac = flonum_obj(i); ac = flonum_obj(i);
gonexti(); gonexti();
} }
@ -2312,14 +2315,15 @@ define_instruction(quo) {
if (unlikely(y == fixnum_obj(0))) fail("division by zero"); if (unlikely(y == fixnum_obj(0))) fail("division by zero");
ac = fixnum_obj(fxquo(get_fixnum(x), get_fixnum(y))); ac = fixnum_obj(fxquo(get_fixnum(x), get_fixnum(y)));
} else { } else {
double dx, dy; double dx, dy, dz;
if (likely(is_flonum(x))) dx = get_flonum(x); if (likely(is_flonum(x) && flisint(dx = get_flonum(x)))) /* ok */;
else if (likely(is_fixnum(x))) dx = (double)get_fixnum(x); else if (likely(is_fixnum(x))) dx = (double)get_fixnum(x);
else failtype(x, "number"); else failtype(x, "integer");
if (likely(is_flonum(y))) dy = get_flonum(y); if (likely(is_flonum(y) && flisint(dy = get_flonum(y)))) /* ok */;
else if (likely(is_fixnum(y))) dy = (double)get_fixnum(y); else if (likely(is_fixnum(y))) dy = (double)get_fixnum(y);
else failtype(y, "number"); else failtype(y, "integer");
ac = flonum_obj(flquo(dx, dy)); modf(dx / dy, &dz);
ac = flonum_obj(dz);
} }
gonexti(); gonexti();
} }
@ -2330,14 +2334,16 @@ define_instruction(rem) {
if (unlikely(y == fixnum_obj(0))) fail("division by zero"); if (unlikely(y == fixnum_obj(0))) fail("division by zero");
ac = fixnum_obj(fxrem(get_fixnum(x), get_fixnum(y))); ac = fixnum_obj(fxrem(get_fixnum(x), get_fixnum(y)));
} else { } else {
double dx, dy; double dx, dy, dz;
if (likely(is_flonum(x))) dx = get_flonum(x); if (likely(is_flonum(x) && flisint(dx = get_flonum(x)))) /* ok */;
else if (likely(is_fixnum(x))) dx = (double)get_fixnum(x); else if (likely(is_fixnum(x))) dx = (double)get_fixnum(x);
else failtype(x, "number"); else failtype(x, "integer");
if (likely(is_flonum(y))) dy = get_flonum(y); if (likely(is_flonum(y) && flisint(dy = get_flonum(y)))) /* ok */;
else if (likely(is_fixnum(y))) dy = (double)get_fixnum(y); else if (likely(is_fixnum(y))) dy = (double)get_fixnum(y);
else failtype(y, "number"); else failtype(y, "integer");
ac = flonum_obj(flrem(dx, dy)); dz = fmod(dx, dy);
/* keep zero positive: (remainder -10.0 2.0) => 0.0, not -0.0 */
ac = flonum_obj((dz == 0.0) ? 0.0 : dz);
} }
gonexti(); gonexti();
} }
@ -2449,8 +2455,9 @@ define_instruction(ge) {
define_instruction(eq) { define_instruction(eq) {
obj x = ac, y = spop(); obj x = ac, y = spop();
if (x == y) ac = bool_obj(1); if (likely(are_fixnums(x, y))) {
else if (is_flonum(x) || is_flonum(y)) { ac = bool_obj(x == y);
} else if (is_flonum(x) || is_flonum(y)) {
double dx, dy; double dx, dy;
if (likely(is_flonum(x))) dx = get_flonum(x); if (likely(is_flonum(x))) dx = get_flonum(x);
else if (likely(is_fixnum(x))) dx = (double)get_fixnum(x); else if (likely(is_fixnum(x))) dx = (double)get_fixnum(x);
@ -2465,8 +2472,9 @@ define_instruction(eq) {
define_instruction(ne) { define_instruction(ne) {
obj x = ac, y = spop(); obj x = ac, y = spop();
if (x == y) ac = bool_obj(0); if (likely(are_fixnums(x, y))) {
else if (is_flonum(x) || is_flonum(y)) { ac = bool_obj(x != y);
} else if (is_flonum(x) || is_flonum(y)) {
double dx, dy; double dx, dy;
if (likely(is_flonum(x))) dx = get_flonum(x); if (likely(is_flonum(x))) dx = get_flonum(x);
else if (likely(is_fixnum(x))) dx = (double)get_fixnum(x); else if (likely(is_fixnum(x))) dx = (double)get_fixnum(x);