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

Raising an error for inexact->exact on non-finite numbers.

Browse source
This commit is contained in:
Alex Shinn 2012-11-09 23:05:25 +09:00
parent 1d3e043e68
commit f792329eed
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
vm.c
View file

@ -1862,17 +1862,19 @@ sexp sexp_apply (sexp ctx, sexp proc, sexp args) {
_ARG1 = sexp_make_flonum(ctx, sexp_ratio_to_double(_ARG1)); _ARG1 = sexp_make_flonum(ctx, sexp_ratio_to_double(_ARG1));
#endif #endif
else if (! sexp_flonump(_ARG1)) else if (! sexp_flonump(_ARG1))
sexp_raise("exact->inexact: not a number", sexp_list1(ctx, _ARG1)); sexp_raise("inexact: not a number", sexp_list1(ctx, _ARG1));
#endif #endif
break; break;
case SEXP_OP_FLO2FIX: case SEXP_OP_FLO2FIX:
#if SEXP_USE_FLONUMS #if SEXP_USE_FLONUMS
if (sexp_flonump(_ARG1)) { if (sexp_flonump(_ARG1)) {
if (sexp_flonum_value(_ARG1) != trunc(sexp_flonum_value(_ARG1))) { if (isinf(sexp_flonum_value(_ARG1)) || isnan(sexp_flonum_value(_ARG1))) {
sexp_raise("exact: not an finite number", sexp_list1(ctx, _ARG1));
} else if (sexp_flonum_value(_ARG1) != trunc(sexp_flonum_value(_ARG1))) {
#if SEXP_USE_RATIOS #if SEXP_USE_RATIOS
_ARG1 = sexp_double_to_ratio(ctx, sexp_flonum_value(_ARG1)); _ARG1 = sexp_double_to_ratio(ctx, sexp_flonum_value(_ARG1));
#else #else
sexp_raise("inexact->exact: not an integer", sexp_list1(ctx, _ARG1)); sexp_raise("exact: not an integer", sexp_list1(ctx, _ARG1));
#endif #endif
#if SEXP_USE_BIGNUMS #if SEXP_USE_BIGNUMS
} else if ((sexp_flonum_value(_ARG1) > SEXP_MAX_FIXNUM) } else if ((sexp_flonum_value(_ARG1) > SEXP_MAX_FIXNUM)
@ -1884,7 +1886,7 @@ sexp sexp_apply (sexp ctx, sexp proc, sexp args) {
_ARG1 = sexp_make_fixnum((sexp_sint_t)sexp_flonum_value(_ARG1)); _ARG1 = sexp_make_fixnum((sexp_sint_t)sexp_flonum_value(_ARG1));
} }
} else if (!sexp_exactp(_ARG1)) { } else if (!sexp_exactp(_ARG1)) {
sexp_raise("inexact->exact: not a number", sexp_list1(ctx, _ARG1)); sexp_raise("exact: not a number", sexp_list1(ctx, _ARG1));
} }
#endif #endif
break; break;