Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-22 07:09:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing vm <, >, = comparator cases when both flonums and bignums are disabled

Browse source
This commit is contained in:
Alex Shinn 2009-12-28 00:06:46 +09:00
parent 17e4f63f94
commit 1fda388db9
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
eval.c
View file

@ -1845,14 +1845,14 @@ sexp sexp_vm (sexp ctx, sexp proc) {
}
#else
#if SEXP_USE_FLONUMS
} else if (sexp_flonump(_ARG1) && sexp_flonump(_ARG2))
} else if (sexp_flonump(_ARG1) && sexp_flonump(_ARG2)) {
i = sexp_flonum_value(_ARG1) < sexp_flonum_value(_ARG2);
else if (sexp_flonump(_ARG1) && sexp_fixnump(_ARG2))
i = sexp_flonum_value(_ARG1) < (double)sexp_unbox_fixnum(_ARG2);
else if (sexp_fixnump(_ARG1) && sexp_flonump(_ARG2))
} else if (sexp_flonump(_ARG1) && sexp_fixnump(_ARG2)) {
i = sexp_flonum_value(_ARG1) < (double)sexp_unbox_fixnum(_ARG2);
} else if (sexp_fixnump(_ARG1) && sexp_flonump(_ARG2)) {
i = (double)sexp_unbox_fixnum(_ARG1) < sexp_flonum_value(_ARG2);
#endif
else sexp_raise("<: not a number", sexp_list2(ctx, _ARG1, _ARG2));
} else sexp_raise("<: not a number", sexp_list2(ctx, _ARG1, _ARG2));
_ARG2 = sexp_make_boolean(i);
#endif
top--;
@ -1869,14 +1869,14 @@ sexp sexp_vm (sexp ctx, sexp proc) {
}
#else
#if SEXP_USE_FLONUMS
} else if (sexp_flonump(_ARG1) && sexp_flonump(_ARG2))
} else if (sexp_flonump(_ARG1) && sexp_flonump(_ARG2)) {
i = sexp_flonum_value(_ARG1) <= sexp_flonum_value(_ARG2);
else if (sexp_flonump(_ARG1) && sexp_fixnump(_ARG2))
} else if (sexp_flonump(_ARG1) && sexp_fixnump(_ARG2)) {
i = sexp_flonum_value(_ARG1) <= (double)sexp_unbox_fixnum(_ARG2);
else if (sexp_fixnump(_ARG1) && sexp_flonump(_ARG2))
} else if (sexp_fixnump(_ARG1) && sexp_flonump(_ARG2)) {
i = (double)sexp_unbox_fixnum(_ARG1) <= sexp_flonum_value(_ARG2);
#endif
else sexp_raise("<=: not a number", sexp_list2(ctx, _ARG1, _ARG2));
} else sexp_raise("<=: not a number", sexp_list2(ctx, _ARG1, _ARG2));
_ARG2 = sexp_make_boolean(i);
#endif
top--;
@ -1893,14 +1893,14 @@ sexp sexp_vm (sexp ctx, sexp proc) {
}
#else
#if SEXP_USE_FLONUMS
} else if (sexp_flonump(_ARG1) && sexp_flonump(_ARG2))
} else if (sexp_flonump(_ARG1) && sexp_flonump(_ARG2)) {
i = sexp_flonum_value(_ARG1) == sexp_flonum_value(_ARG2);
else if (sexp_flonump(_ARG1) && sexp_fixnump(_ARG2))
} else if (sexp_flonump(_ARG1) && sexp_fixnump(_ARG2)) {
i = sexp_flonum_value(_ARG1) == (double)sexp_unbox_fixnum(_ARG2);
else if (sexp_fixnump(_ARG1) && sexp_flonump(_ARG2))
} else if (sexp_fixnump(_ARG1) && sexp_flonump(_ARG2)) {
i = (double)sexp_unbox_fixnum(_ARG1) == sexp_flonum_value(_ARG2);
#endif
else sexp_raise("=: not a number", sexp_list2(ctx, _ARG1, _ARG2));
} else sexp_raise("=: not a number", sexp_list2(ctx, _ARG1, _ARG2));
_ARG2 = sexp_make_boolean(i);
#endif
top--;