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

fix baacktrackable predicates.

Browse Source
This commit is contained in:
Vitor Santos Costa 2015-03-09 17:27:35 +00:00
parent 252a2b7868
commit 580bc9eb27
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
C/stdpreds.c
View File

@ -931,6 +931,7 @@ static Int cont_current_predicate(USES_REGS1) {
if (!is_det) { if (!is_det) {
EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(p); EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(p);
EXTRA_CBACK_ARG(4, 2) = MkAddressTerm(q); EXTRA_CBACK_ARG(4, 2) = MkAddressTerm(q);
B->cp_h = HR;
} }
} else if (IsNonVarTerm(t2)) { } else if (IsNonVarTerm(t2)) {
// operating within the same module. // operating within the same module.
@ -943,6 +944,7 @@ static Int cont_current_predicate(USES_REGS1) {
npp = pp->NextPredOfModule; npp = pp->NextPredOfModule;
if (npp) { if (npp) {
EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(npp); EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(npp);
B->cp_h = HR;
} else { } else {
is_det = true; is_det = true;
} }
@ -957,12 +959,14 @@ static Int cont_current_predicate(USES_REGS1) {
else { else {
pp = m->PredForME; pp = m->PredForME;
EXTRA_CBACK_ARG(4, 2) = MkAddressTerm(m); EXTRA_CBACK_ARG(4, 2) = MkAddressTerm(m);
B->cp_h = HR;
} }
} // we found a new answer } // we found a new answer
if (!pp) if (!pp)
cut_fail(); cut_fail();
else else
EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(pp->NextPredOfModule); EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(pp->NextPredOfModule);
B->cp_h = HR;
} }
if (pp->ModuleOfPred != IDB_MODULE) { if (pp->ModuleOfPred != IDB_MODULE) {
f = pp->FunctorOfPred; f = pp->FunctorOfPred;
@ -1081,6 +1085,7 @@ static Int init_current_predicate(USES_REGS1) {
cut_fail(); cut_fail();
EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(p); EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(p);
EXTRA_CBACK_ARG(4, 2) = MkAddressTerm(q); EXTRA_CBACK_ARG(4, 2) = MkAddressTerm(q);
B->cp_h = HR;
} }
} }
// check module // check module
@ -1102,6 +1107,7 @@ static Int init_current_predicate(USES_REGS1) {
} }
EXTRA_CBACK_ARG(4, 2) = MkAddressTerm(m); EXTRA_CBACK_ARG(4, 2) = MkAddressTerm(m);
EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(pp); EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(pp);
B->cp_h = HR;
} }
// ensure deref access to choice-point fields. // ensure deref access to choice-point fields.
return cont_current_predicate(PASS_REGS1); return cont_current_predicate(PASS_REGS1);
@ -1124,7 +1130,7 @@ int Yap_IsOpMaxPrio(Atom at) {
CACHE_REGS CACHE_REGS
OpEntry *op = NextOp(RepOpProp((Prop)(RepAtom(at)->PropsOfAE)) PASS_REGS); OpEntry *op = NextOp(RepOpProp((Prop)(RepAtom(at)->PropsOfAE)) PASS_REGS);
int max; int max;
if (EndOfPAEntr(op)) if (EndOfPAEntr(op))
return 0; return 0;
max = (op->Prefix & 0xfff); max = (op->Prefix & 0xfff);
@ -1156,6 +1162,7 @@ static Int cont_current_op(USES_REGS1) {
READ_UNLOCK(op->OpRWLock); READ_UNLOCK(op->OpRWLock);
if (next) { if (next) {
EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((CELL)next); EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((CELL)next);
B->cp_h = HR;
return TRUE; return TRUE;
} else { } else {
cut_succeed(); cut_succeed();
@ -1164,6 +1171,7 @@ static Int cont_current_op(USES_REGS1) {
READ_UNLOCK(op->OpRWLock); READ_UNLOCK(op->OpRWLock);
if (next) { if (next) {
EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((CELL)next); EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((CELL)next);
B->cp_h = HR;
return FALSE; return FALSE;
} else { } else {
cut_fail(); cut_fail();
@ -1171,21 +1179,22 @@ static Int cont_current_op(USES_REGS1) {
} }
} }
static Int init_current_op( static Int init_current_op(USES_REGS1) { /* current_op(-Precedence,-Type,-Atom) */
USES_REGS1) { /* current_op(-Precedence,-Type,-Atom) */
EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((CELL)OpList); EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((CELL)OpList);
B->cp_h = HR;
return cont_current_op(PASS_REGS1); return cont_current_op(PASS_REGS1);
} }
static Int cont_current_atom_op(USES_REGS1) { static Int cont_current_atom_op(USES_REGS1) {
OpEntry *op = (OpEntry *)IntegerOfTerm(EXTRA_CBACK_ARG(5, 1)), *next; OpEntry *op = (OpEntry *)IntegerOfTerm(EXTRA_CBACK_ARG(5, 1)), *next;
READ_LOCK(op->OpRWLock); READ_LOCK(op->OpRWLock);
next = NextOp(RepOpProp(op->NextOfPE) PASS_REGS); next = NextOp(RepOpProp(op->NextOfPE) PASS_REGS);
if (unify_op(op PASS_REGS)) { if (unify_op(op PASS_REGS)) {
READ_UNLOCK(op->OpRWLock); READ_UNLOCK(op->OpRWLock);
if (next) { if (next) {
EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((CELL)next); EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((CELL)next);
B->cp_h = HR;
return TRUE; return TRUE;
} else { } else {
cut_succeed(); cut_succeed();
@ -1194,6 +1203,7 @@ static Int cont_current_atom_op(USES_REGS1) {
READ_UNLOCK(op->OpRWLock); READ_UNLOCK(op->OpRWLock);
if (next) { if (next) {
EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((CELL)next); EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((CELL)next);
B->cp_h = HR;
return FALSE; return FALSE;
} else { } else {
cut_fail(); cut_fail();
@ -1216,6 +1226,7 @@ static Int init_current_atom_op(
cut_fail(); cut_fail();
} }
EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((Int)ope); EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((Int)ope);
B->cp_h = HR;
return cont_current_atom_op(PASS_REGS1); return cont_current_atom_op(PASS_REGS1);
} }

2
pl/preds.yap
View File

@ -1171,7 +1171,7 @@ current_predicate(A,T) :-
format('`0 ~w~n', [M:T0]), format('`0 ~w~n', [M:T0]),
( (
'$current_predicate'(A, M, T0, Flags), '$current_predicate'(A, M, T0, Flags),
TFlags is Flags /\ 0x00004000, %TFlags is Flags /\ 0x00004000,
% format('1 ~w ~16r~n', [M:T0,Flags, TFlags]), % format('1 ~w ~16r~n', [M:T0,Flags, TFlags]),
Flags /\ 0x00004000 =:= 0x0 Flags /\ 0x00004000 =:= 0x0
; ;