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

py

Browse Source
This commit is contained in:
Vítor Santos Costa 2019-04-13 14:05:31 +01:00
parent 9172f2994b
commit 7d85bbfa27
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CXX/yapi.cpp
View File

@ -636,7 +636,6 @@ Term YAPEngine::fun(Term t) {
Atom name; Atom name;
yhandle_t yt = Yap_NewHandles(1); yhandle_t yt = Yap_NewHandles(1);
if (IsApplTerm(t)) { if (IsApplTerm(t)) {
ts = RepAppl(t) + 1; ts = RepAppl(t) + 1;
f = (Functor)ts[-1]; f = (Functor)ts[-1];
@ -647,29 +646,32 @@ Term YAPEngine::fun(Term t) {
for (arity_t i = 0; i < arity; i++) { for (arity_t i = 0; i < arity; i++) {
HR[i + 1] = ts[i]; HR[i + 1] = ts[i];
} }
HR[arity] = Yap_GetFromHandle(yt);
HR += (arity+2); HR += (arity+2);
arity++;
} else if (IsAtomTerm(t)) { } else if (IsAtomTerm(t)) {
name = AtomOfTerm(t); name = AtomOfTerm(t);
t = AbsAppl(HR); t = AbsAppl(HR);
HR[0] = (CELL)Yap_MkFunctor(name, 1); HR[0] = (CELL)Yap_MkFunctor(name, 1);
HR[1] = Yap_GetFromHandle(yt);
HR += 2; HR += 2;
arity = 1;
} else if (IsPairTerm(t)) { } else if (IsPairTerm(t)) {
HR[0] = (CELL)Yap_MkFunctor(AtomDot, 3); HR[0] = (CELL)Yap_MkFunctor(AtomDot, 3);
HR[1] = ts[0]; HR[1] = ts[0];
HR[2] = ts[1]; HR[2] = ts[1];
HR[3] = Yap_GetFromHandle(yt); HR += 4;
arity = 3;
} else { } else {
throw YAPError(SOURCE(), TYPE_ERROR_CALLABLE, t, 0); throw YAPError(SOURCE(), TYPE_ERROR_CALLABLE, t, 0);
return 0L; return 0L;
} }
RESET_VARIABLE(HR-1);
yt = Yap_InitHandle(t);
CACHE_REGS CACHE_REGS
BACKUP_MACHINE_REGS(); BACKUP_MACHINE_REGS();
bool rc = YAP_RunGoalOnce(t); bool rc = YAP_RunGoalOnce(t);
Term ot; Term ot;
if (rc) if (rc)
ot = Yap_GetFromHandle(yt); ot = ArgOfTerm(arity,Yap_GetFromHandle(yt));
else else
ot = TermNone; ot = TermNone;
RECOVER_MACHINE_REGS(); RECOVER_MACHINE_REGS();