fixes
This commit is contained in:
parent
ef226da706
commit
552cefbcd0
27
CXX/yapi.cpp
27
CXX/yapi.cpp
|
@ -613,11 +613,7 @@ bool YAPEngine::mgoal(Term t, Term tmod, bool release) {
|
||||||
CACHE_REGS
|
CACHE_REGS
|
||||||
YAP_dogoalinfo q;
|
YAP_dogoalinfo q;
|
||||||
BACKUP_MACHINE_REGS();
|
BACKUP_MACHINE_REGS();
|
||||||
<<<<<<< HEAD
|
|
||||||
bool rc = YAP_RunGoalOnce(t);
|
|
||||||
RECOVER_MACHINE_REGS();
|
|
||||||
return rc;
|
|
||||||
=======
|
|
||||||
Term *ts = nullptr;
|
Term *ts = nullptr;
|
||||||
q.CurSlot = Yap_StartSlots();
|
q.CurSlot = Yap_StartSlots();
|
||||||
q.p = P;
|
q.p = P;
|
||||||
|
@ -658,7 +654,6 @@ bool YAPEngine::mgoal(Term t, Term tmod, bool release) {
|
||||||
// PyEval_RestoreThread(_save);
|
// PyEval_RestoreThread(_save);
|
||||||
RECOVER_MACHINE_REGS();
|
RECOVER_MACHINE_REGS();
|
||||||
return result;
|
return result;
|
||||||
>>>>>>> ef3d435dec2b9606993430da2f66e06d38f3a399
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* called when a query must be terminated and its state fully recovered,
|
* called when a query must be terminated and its state fully recovered,
|
||||||
|
@ -680,18 +675,15 @@ Term YAPEngine::fun(Term t) {
|
||||||
arity_t arity;
|
arity_t arity;
|
||||||
Functor f;
|
Functor f;
|
||||||
Atom name;
|
Atom name;
|
||||||
<<<<<<< HEAD
|
|
||||||
YAP_dogoalinfo backup = q;
|
YAP_dogoalinfo backup = q;
|
||||||
CELL *spt;
|
CELL *spt;
|
||||||
|
|
||||||
=======
|
|
||||||
q.CurSlot = Yap_StartSlots();
|
q.CurSlot = Yap_StartSlots();
|
||||||
q.p = P;
|
q.p = P;
|
||||||
q.cp = CP;
|
q.cp = CP;
|
||||||
|
|
||||||
Int oenv = LCL0-ENV;
|
Int oenv = LCL0-ENV;
|
||||||
Int oB = LCL0-CellPtr(B);
|
Int oB = LCL0-CellPtr(B);
|
||||||
>>>>>>> ef3d435dec2b9606993430da2f66e06d38f3a399
|
|
||||||
if (IsApplTerm(t)) {
|
if (IsApplTerm(t)) {
|
||||||
ts = RepAppl(t) + 1;
|
ts = RepAppl(t) + 1;
|
||||||
f = (Functor)ts[-1];
|
f = (Functor)ts[-1];
|
||||||
|
@ -714,18 +706,6 @@ Term YAPEngine::fun(Term t) {
|
||||||
throw YAPError(SOURCE(), TYPE_ERROR_CALLABLE, t, 0);
|
throw YAPError(SOURCE(), TYPE_ERROR_CALLABLE, t, 0);
|
||||||
return 0L;
|
return 0L;
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
HR += arity+1;
|
|
||||||
RESET_VARIABLE(HR-1);
|
|
||||||
yhandle yt = Yap_InitHandle(t);
|
|
||||||
Term ot;
|
|
||||||
bool rc = YAP_RunGoalOnce(t);
|
|
||||||
if (rc)
|
|
||||||
ot = Yap_GetArg(arity,Yap_GetFromHandle(yt));
|
|
||||||
else
|
|
||||||
ot = TermNone;
|
|
||||||
RECOVER_MACHINE_REGS();
|
|
||||||
=======
|
|
||||||
Term ot = XREGS[arity + 1] = MkVarTerm();
|
Term ot = XREGS[arity + 1] = MkVarTerm();
|
||||||
yhandle_t h = Yap_InitHandle(ot);
|
yhandle_t h = Yap_InitHandle(ot);
|
||||||
arity++;
|
arity++;
|
||||||
|
@ -754,8 +734,7 @@ Term YAPEngine::fun(Term t) {
|
||||||
RECOVER_MACHINE_REGS();
|
RECOVER_MACHINE_REGS();
|
||||||
return ot;
|
return ot;
|
||||||
}
|
}
|
||||||
>>>>>>> ef3d435dec2b9606993430da2f66e06d38f3a399
|
}
|
||||||
}
|
|
||||||
|
|
||||||
YAPQuery::YAPQuery(YAPFunctor f, YAPTerm mod, YAPTerm ts[])
|
YAPQuery::YAPQuery(YAPFunctor f, YAPTerm mod, YAPTerm ts[])
|
||||||
: YAPPredicate(f, mod) {
|
: YAPPredicate(f, mod) {
|
||||||
|
|
|
@ -1934,6 +1934,9 @@ static Int p_sleep(USES_REGS1) {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if MCHECK_H
|
||||||
|
#include <mcheck.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
static Int
|
static Int
|
||||||
p_mtrace()
|
p_mtrace()
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
#sqlite3 is now in the system
|
#sqlite3 is now in the system
|
||||||
|
|
||||||
set (SQLITE3_FOUND ON CACHE PRIVATE "")
|
set (SQLITE3_FOUND ON CACHE . YYES )
|
||||||
|
|
||||||
set_property(DIRECTORY
|
set_property(DIRECTORY
|
||||||
APPEND PROPERTY
|
APPEND PROPERTY
|
||||||
|
|
|
@ -58,7 +58,7 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/yap4py/yap_wrap.cxx ${CM
|
||||||
add_custom_target( YAP4PY ALL
|
add_custom_target( YAP4PY ALL
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/yap4py
|
COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/yap4py
|
||||||
COMMAND ${PYTHON_EXECUTABLE} setup.py sdist ${bdist}
|
COMMAND ${PYTHON_EXECUTABLE} setup.py sdist ${bdist}
|
||||||
DEPENDS ${CMAKE_SOURCE_DIR}/CXX/yapi.cpp Py4YAP YAP++ yap4py/yapi.cpp YAP4PY_PY ${CMAKE_CURRENT_BINARY_DIR}/yap4py/yap_wrap.cxx ${CMAKE_CURRENT_BINARY_DIR}/yap4py/yap_wrap.hh ${PYTHON_SOURCES} Py4YAP STARTUP libYap
|
DEPENDS ${CMAKE_SOURCE_DIR}/CXX/yapi.cpp Py4YAP YAP++ yap4py/yapi.cpp ${YAP4PY_PY} ${CMAKE_CURRENT_BINARY_DIR}/yap4py/yap_wrap.cxx ${CMAKE_CURRENT_BINARY_DIR}/yap4py/yap_wrap.hh ${PYTHON_SOURCES} Py4YAP STARTUP libYap
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
Reference in New Issue