fixes for non-gmp case.

This commit is contained in:
Vítor Santos Costa II 2010-04-14 19:49:22 +01:00
parent 2b4e51a2d4
commit 3666988f57

View File

@ -488,7 +488,7 @@ eval1(Int fi, Term t) {
return Yap_ArithError(DOMAIN_ERROR_OUT_OF_RANGE, t, "integer(%f)", dbl); return Yap_ArithError(DOMAIN_ERROR_OUT_OF_RANGE, t, "integer(%f)", dbl);
} }
#endif #endif
#if HAVE_ISNAN #if HAVE_ISINF
if (isinf(dbl)) { if (isinf(dbl)) {
return Yap_ArithError(EVALUATION_ERROR_INT_OVERFLOW, MkFloatTerm(dbl), "integer\ return Yap_ArithError(EVALUATION_ERROR_INT_OVERFLOW, MkFloatTerm(dbl), "integer\
(%f)",dbl); (%f)",dbl);
@ -526,7 +526,7 @@ eval1(Int fi, Term t) {
return Yap_ArithError(DOMAIN_ERROR_OUT_OF_RANGE, t, "integer(%f)", dbl); return Yap_ArithError(DOMAIN_ERROR_OUT_OF_RANGE, t, "integer(%f)", dbl);
} }
#endif #endif
#if HAVE_ISNAN #if HAVE_ISINF
if (isinf(dbl)) { if (isinf(dbl)) {
return Yap_ArithError(EVALUATION_ERROR_INT_OVERFLOW, MkFloatTerm(dbl), "integer\ return Yap_ArithError(EVALUATION_ERROR_INT_OVERFLOW, MkFloatTerm(dbl), "integer\
(%f)",dbl); (%f)",dbl);
@ -555,8 +555,8 @@ eval1(Int fi, Term t) {
} }
return t; return t;
break; break;
default:
#endif #endif
default:
RERROR(); RERROR();
} }
#if HAVE_ISNAN #if HAVE_ISNAN
@ -564,7 +564,7 @@ eval1(Int fi, Term t) {
return Yap_ArithError(DOMAIN_ERROR_OUT_OF_RANGE, t, "integer(%f)", dbl); return Yap_ArithError(DOMAIN_ERROR_OUT_OF_RANGE, t, "integer(%f)", dbl);
} }
#endif #endif
#if HAVE_ISNAN #if HAVE_ISINF
if (isinf(dbl)) { if (isinf(dbl)) {
return Yap_ArithError(EVALUATION_ERROR_INT_OVERFLOW, MkFloatTerm(dbl), "integer\ return Yap_ArithError(EVALUATION_ERROR_INT_OVERFLOW, MkFloatTerm(dbl), "integer\
(%f)",dbl); (%f)",dbl);
@ -585,14 +585,14 @@ eval1(Int fi, Term t) {
case double_e: case double_e:
dbl = FloatOfTerm(t); dbl = FloatOfTerm(t);
break; break;
#ifdef USE_GMP
case big_int_e: case big_int_e:
#ifdef USE_GMP
if (yap_flags[LANGUAGE_MODE_FLAG] == 1) { /* iso */ if (yap_flags[LANGUAGE_MODE_FLAG] == 1) { /* iso */
return Yap_ArithError(TYPE_ERROR_FLOAT, t, "X is round(BIGNUM)"); return Yap_ArithError(TYPE_ERROR_FLOAT, t, "X is round(BIGNUM)");
} }
return t; return t;
default:
#endif #endif
default:
RERROR(); RERROR();
} }
#if HAVE_ISNAN #if HAVE_ISNAN
@ -600,7 +600,7 @@ eval1(Int fi, Term t) {
return Yap_ArithError(DOMAIN_ERROR_OUT_OF_RANGE, t, "integer(%f)", dbl); return Yap_ArithError(DOMAIN_ERROR_OUT_OF_RANGE, t, "integer(%f)", dbl);
} }
#endif #endif
#if HAVE_ISNAN #if HAVE_ISINF
if (isinf(dbl)) { if (isinf(dbl)) {
return Yap_ArithError(EVALUATION_ERROR_INT_OVERFLOW, MkFloatTerm(dbl), "integer\ return Yap_ArithError(EVALUATION_ERROR_INT_OVERFLOW, MkFloatTerm(dbl), "integer\
(%f)",dbl); (%f)",dbl);