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

Handle exported predicates in meta-calls

Browse Source
This commit is contained in:
Vitor Santos Costa 2017-05-25 19:02:33 +01:00
parent 6a2d74ac6e
commit 9560aa026e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
C/exec.c
View File

@ -315,7 +315,7 @@ inline static bool do_execute(Term t, Term mod USES_REGS) {
/* I cannot use the standard macro here because /* I cannot use the standard macro here because
otherwise I would dereference the argument and otherwise I would dereference the argument and
might skip a svar */ might skip a svar */
if (pen->PredFlags & MetaPredFlag) { if (pen->PredFlags & (MetaPredFlag|UndefPredFlag)) {
return CallMetaCall(t, mod PASS_REGS); return CallMetaCall(t, mod PASS_REGS);
} }
pt = RepAppl(t) + 1; pt = RepAppl(t) + 1;
@ -441,7 +441,7 @@ inline static bool do_execute_n(Term t, Term mod, unsigned int n USES_REGS) {
pen = RepPredProp(PredPropByFunc(f, mod)); pen = RepPredProp(PredPropByFunc(f, mod));
/* You thought we would be over by now */ /* You thought we would be over by now */
/* but no meta calls require special preprocessing */ /* but no meta calls require special preprocessing */
if (pen->PredFlags & MetaPredFlag) { if (pen->PredFlags & (MetaPredFlag|UndefPredFlag)) {
Term t = copy_execn_to_heap(f, pt, n, arity, mod PASS_REGS); Term t = copy_execn_to_heap(f, pt, n, arity, mod PASS_REGS);
return (CallMetaCall(t, mod PASS_REGS)); return (CallMetaCall(t, mod PASS_REGS));
} }
@ -1812,7 +1812,7 @@ Term Yap_RunTopGoal(Term t, bool handle_errors) {
HR[1] = MkAtomTerm(Yap_LookupAtom("top")); HR[1] = MkAtomTerm(Yap_LookupAtom("top"));
arity = 2; arity = 2;
HR += 2; HR += 2;
} else if (ppe->PredFlags & MetaPredFlag) { } else if (ppe->PredFlags & (MetaPredFlag|UndefPredFlag)) {
// we're in a meta-call, rake care about modules // we're in a meta-call, rake care about modules
// //
Term ts[2]; Term ts[2];