debugging support

This commit is contained in:
Vitor Santos Costa 2017-09-17 07:51:59 +01:00
parent 65126b1b54
commit 35e12bd9c4

View File

@ -29,8 +29,8 @@
*/ */
#include "Yap.h" #include "Yap.h"
#include "clause.h"
#include "YapEval.h" #include "YapEval.h"
#include "clause.h"
#include "iopreds.h" #include "iopreds.h"
#include "tracer.h" #include "tracer.h"
#include "yapio.h" #include "yapio.h"
@ -163,13 +163,7 @@ static PredEntry *PredForChoicePt(yamop *p_code, op_numbers *opn) {
/* compile error --> return ENV_ToP(gc_B->cp_cp); */ /* compile error --> return ENV_ToP(gc_B->cp_cp); */
#endif /* TABLING */ #endif /* TABLING */
case _or_else: case _or_else:
if (p_code == p_code->y_u.Osblp.l) {
/* repeat */
Atom at = AtomRepeatSpace;
return RepPredProp(PredPropByAtom(at, PROLOG_MODULE));
} else {
return p_code->y_u.Osblp.p0; return p_code->y_u.Osblp.p0;
}
break; break;
case _or_last: case _or_last:
#ifdef YAPOR #ifdef YAPOR
@ -779,7 +773,8 @@ static PredEntry *found_expand(yamop *pc, void **startp,
return pp; return pp;
} }
static PredEntry *found_ystop(yamop *pc, int clause_code, void **startp, void **endp, PredEntry *pp USES_REGS) { static PredEntry *found_ystop(yamop *pc, int clause_code, void **startp,
void **endp, PredEntry *pp USES_REGS) {
if (pc == YESCODE) { if (pc == YESCODE) {
pp = RepPredProp(Yap_GetPredPropByAtom(AtomTrue, CurrentModule)); pp = RepPredProp(Yap_GetPredPropByAtom(AtomTrue, CurrentModule));
if (startp) if (startp)
@ -2058,7 +2053,8 @@ Term Yap_env_location(yamop *cp, choiceptr b_ptr, CELL *env, Int ignore_first) {
PredEntry *pe = EnvPreg(cp); PredEntry *pe = EnvPreg(cp);
if (pe == PredTrue) if (pe == PredTrue)
return TermNil; return TermNil;
if (ignore_first <= 0 && pe if (ignore_first <= 0 &&
pe
// pe->ModuleOfPred != PROLOG_MODULE &&s // pe->ModuleOfPred != PROLOG_MODULE &&s
&& !(pe->PredFlags & HiddenPredFlag)) { && !(pe->PredFlags & HiddenPredFlag)) {
return build_bug_location(cp, pe); return build_bug_location(cp, pe);