diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

depth limit cn go to infinity

Browse Source
This commit is contained in:
Vítor Santos Costa 2013-01-20 23:15:09 +00:00
parent b24c91eeb3
commit abe9f20a85
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
C/arith1.c
View File

@ -523,8 +523,7 @@ eval1(Int fi, Term t) {
#endif #endif
#if HAVE_ISINF #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);
} }
#endif #endif
if (dbl < 0.0) if (dbl < 0.0)

22
C/depth_bound.c
View File

@ -18,6 +18,11 @@
static char SccsId[] = "%W% %G%"; static char SccsId[] = "%W% %G%";
#endif /* SCCS */ #endif /* SCCS */
#include <math.h>
#ifndef INFINITY
#define INFINITY (1.0/0.0)
#endif
#include "Yap.h" #include "Yap.h"
#ifdef DEPTH_LIMIT #ifdef DEPTH_LIMIT
@ -29,7 +34,10 @@ STD_PROTO(static Int p_set_depth_limit, ( USES_REGS1 ));
static Int p_get_depth_limit( USES_REGS1 ) static Int p_get_depth_limit( USES_REGS1 )
{ {
return(Yap_unify_constant(ARG1, MkIntTerm(IntOfTerm(DEPTH/2)))); Int d = IntOfTerm(DEPTH);
if (d % 2 == 1)
return(Yap_unify(ARG1, MkFloatTerm(INFINITY)));
return(Yap_unify_constant(ARG1, MkIntTerm(d/2)));
} }
static Int p_set_depth_limit( USES_REGS1 ) static Int p_set_depth_limit( USES_REGS1 )
@ -40,8 +48,12 @@ static Int p_set_depth_limit( USES_REGS1 )
Yap_Error(INSTANTIATION_ERROR, d, "set-depth_limit"); Yap_Error(INSTANTIATION_ERROR, d, "set-depth_limit");
return(FALSE); return(FALSE);
} else if (!IsIntegerTerm(d)) { } else if (!IsIntegerTerm(d)) {
Yap_Error(TYPE_ERROR_INTEGER, d, "set-depth_limit"); if (IsFloatTerm(d) && isinf(FloatOfTerm(d))) {
return(FALSE); d = RESET_DEPTH();
} else {
Yap_Error(TYPE_ERROR_INTEGER, d, "set-depth_limit");
return(FALSE);
}
} }
d = MkIntTerm(IntegerOfTerm(d)*2); d = MkIntTerm(IntegerOfTerm(d)*2);
@ -59,6 +71,10 @@ static Int p_set_depth_limit_for_next_call( USES_REGS1 )
Yap_Error(INSTANTIATION_ERROR, d, "set-depth_limit"); Yap_Error(INSTANTIATION_ERROR, d, "set-depth_limit");
return(FALSE); return(FALSE);
} else if (!IsIntegerTerm(d)) { } else if (!IsIntegerTerm(d)) {
if (IsFloatTerm(d) && isinf(FloatOfTerm(d))) {
DEPTH = RESET_DEPTH();
return TRUE;
}
Yap_Error(TYPE_ERROR_INTEGER, d, "set-depth_limit"); Yap_Error(TYPE_ERROR_INTEGER, d, "set-depth_limit");
return(FALSE); return(FALSE);
} }