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

fix confusion with SWI handling of C-backtrackable predicates.

Browse Source
This commit is contained in:
Vítor Manuel de Morais Santos Costa 2010-01-12 14:58:48 +00:00
parent bf52be1ece
commit d4b14648b0
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
C/c_interface.c
View File

@ -1341,10 +1341,12 @@ YAP_ExecuteFirst(PredEntry *pe, CPredicate exec_code)
} else if (val == 1) { /* TRUE */ } else if (val == 1) { /* TRUE */
cut_succeed(); cut_succeed();
} else { } else {
if ((val & REDO_PTR) == REDO_PTR) /*
if ((val & REDO_PTR) == REDO_PTR)
ctx->context = (int *)(val & ~REDO_PTR); ctx->context = (int *)(val & ~REDO_PTR);
else else
ctx->context = (int *)((val & ~REDO_PTR)>>FRG_REDO_BITS); ctx->context = (int *)((val & ~REDO_PTR)>>FRG_REDO_BITS);
*/
return TRUE; return TRUE;
} }
} else { } else {
@ -1356,7 +1358,7 @@ YAP_ExecuteFirst(PredEntry *pe, CPredicate exec_code)
Int Int
YAP_ExecuteNext(PredEntry *pe, CPredicate exec_code) YAP_ExecuteNext(PredEntry *pe, CPredicate exec_code)
{ {
if (pe->PredFlags & SWIEnvPredFlag) { if (pe->PredFlags & (SWIEnvPredFlag|CArgsPredFlag)) {
Int val; Int val;
CPredicateV codev = (CPredicateV)exec_code; CPredicateV codev = (CPredicateV)exec_code;
struct foreign_context *ctx = (struct foreign_context *)(&EXTRA_CBACK_ARG(pe->ArityOfPE,1)); struct foreign_context *ctx = (struct foreign_context *)(&EXTRA_CBACK_ARG(pe->ArityOfPE,1));
@ -1372,10 +1374,12 @@ YAP_ExecuteNext(PredEntry *pe, CPredicate exec_code)
} else if (val == 1) { /* TRUE */ } else if (val == 1) { /* TRUE */
cut_succeed(); cut_succeed();
} else { } else {
if ((val & REDO_PTR) == REDO_PTR) /*
if ((val & REDO_PTR) == REDO_PTR)
ctx->context = (int *)(val & ~REDO_PTR); ctx->context = (int *)(val & ~REDO_PTR);
else else
ctx->context = (int *)((val & ~REDO_PTR)>>FRG_REDO_BITS); ctx->context = (int *)((val & ~REDO_PTR)>>FRG_REDO_BITS);
*/
} }
return TRUE; return TRUE;
} }