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

fix

Browse Source
This commit is contained in:
Vitor Santos Costa 2019-02-17 07:58:06 +00:00
parent 2c1565ac0e
commit 6a3c4bda79
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
C/exec.c
View File

@ -135,7 +135,7 @@ inline static bool CallMetaCall(Term t, Term mod USES_REGS) {
* Transfer control to a meta-call in ARG1, cut up to B. * Transfer control to a meta-call in ARG1, cut up to B.
* *
* @param g goal * @param g goal
* @param mod current module * @param mod curre1nt module
* @return su * @return su
*/ */
Term Yap_ExecuteCallMetaCall(Term g, Term mod) { Term Yap_ExecuteCallMetaCall(Term g, Term mod) {
@ -214,14 +214,15 @@ static Int current_choice_point(USES_REGS1) {
* *
* The call will fail if _CP_ is topmost in the search tree. * The call will fail if _CP_ is topmost in the search tree.
*/ */
static Int parent_choice_point(USES_REGS1) { static Int parent_choice_point2(USES_REGS1) {
Term t = Deref(ARG1); Term t = Deref(ARG1);
Term td; Term td;
#if SHADOW_HB #if SHADOW_HB
register CELL *HBREG = HB; register CELL *HBREG = HB;
#endif #endif
if (!IsVarTerm(t)) if (!IsVarTerm(t)) {
return (FALSE); Yap_ThrowError(INSTANTIATION_ERROR, t, "child choicr-point missing");
}
choiceptr cp = cp_from_integer(t); choiceptr cp = cp_from_integer(t);
if (cp == NULL || cp->cp_b == NULL) if (cp == NULL || cp->cp_b == NULL)
return false; return false;
@ -230,6 +231,27 @@ static Int parent_choice_point(USES_REGS1) {
return TRUE; return TRUE;
} }
/** @pred parent_choice_point( -PB )
*
* PB is a number identifying the parent of the current choice-point.
* It storing the offset of the current ch
*
* The call will fail if _CP_ is topmost in the search tree.
*/
static Int parent_choice_point(USES_REGS1) {
Term t = Deref(ARG1);
Term td;
#if SHADOW_HB
register CELL *HBREG = HB;
#endif
if (B == NULL || B->cp_b == NULL)
return false;
td = cp_as_integer(B->cp_b PASS_REGS);
YapBind((CELL *)t, td);
return true;
}
static Int save_env_b(USES_REGS1) { static Int save_env_b(USES_REGS1) {
Term t = Deref(ARG1); Term t = Deref(ARG1);
Term td; Term td;
@ -2334,6 +2356,7 @@ void Yap_InitExecFs(void) {
Yap_InitCPred("current_choicepoint", 1, current_choice_point, 0); Yap_InitCPred("current_choicepoint", 1, current_choice_point, 0);
Yap_InitCPred("env_choice_point", 1, save_env_b, 0); Yap_InitCPred("env_choice_point", 1, save_env_b, 0);
Yap_InitCPred("parent_choice_point", 1, parent_choice_point, 0); Yap_InitCPred("parent_choice_point", 1, parent_choice_point, 0);
Yap_InitCPred("parent_choice_point", 2, parent_choice_point2, 0);
Yap_InitCPred("cut_at", 1, clean_ifcp, SafePredFlag); Yap_InitCPred("cut_at", 1, clean_ifcp, SafePredFlag);
CurrentModule = cm; CurrentModule = cm;
Yap_InitCPred("$restore_regs", 1, restore_regs, Yap_InitCPred("$restore_regs", 1, restore_regs,