Merge ssh://ub64:/home/vitor/Yap/yap-6.3
This commit is contained in:
commit
8a6de8b157
@ -117,12 +117,12 @@ cmp_atoms(Atom a1, Atom a2)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int compare_complex(register CELL *pt0, register CELL *pt0_end, register
|
static Int compare_complex(register CELL *pt0, register CELL *pt0_end, register
|
||||||
CELL *pt1)
|
CELL *pt1)
|
||||||
{
|
{
|
||||||
CACHE_REGS
|
CACHE_REGS
|
||||||
register CELL **to_visit = (CELL **)HR;
|
register CELL **to_visit = (CELL **)HR;
|
||||||
register int out = 0;
|
register Int out = 0;
|
||||||
|
|
||||||
loop:
|
loop:
|
||||||
while (pt0 < pt0_end) {
|
while (pt0 < pt0_end) {
|
||||||
|
43
C/flags.c
43
C/flags.c
@ -47,9 +47,13 @@ static Term sys_pid(Term inp);
|
|||||||
static bool mkprompt(Term inp);
|
static bool mkprompt(Term inp);
|
||||||
static Term synerr(Term inp);
|
static Term synerr(Term inp);
|
||||||
static Term indexer(Term inp);
|
static Term indexer(Term inp);
|
||||||
|
static Term stream(Term inp);
|
||||||
static bool getenc(Term inp);
|
static bool getenc(Term inp);
|
||||||
static bool typein(Term inp);
|
static bool typein(Term inp);
|
||||||
static bool dqf(Term t2);
|
static bool dqf(Term t2);
|
||||||
|
static bool set_error_stream( Term inp );
|
||||||
|
static bool set_input_stream( Term inp );
|
||||||
|
static bool set_output_stream( Term inp );
|
||||||
|
|
||||||
static void newFlag(Term fl, Term val);
|
static void newFlag(Term fl, Term val);
|
||||||
static Int current_prolog_flag(USES_REGS1);
|
static Int current_prolog_flag(USES_REGS1);
|
||||||
@ -168,6 +172,43 @@ static Term isaccess(Term inp) {
|
|||||||
return TermZERO;
|
return TermZERO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Term stream(Term inp) {
|
||||||
|
if ( IsVarTerm(inp) )
|
||||||
|
return inp;
|
||||||
|
if (Yap_CheckStream( inp, Input_Stream_f | Output_Stream_f |
|
||||||
|
Append_Stream_f | Socket_Stream_f, "yap_flag/3" ) >= 0)
|
||||||
|
return inp;
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
set_error_stream( Term inp ) {
|
||||||
|
if( IsVarTerm(inp) )
|
||||||
|
return Yap_unify( inp, Yap_StreamUserName( LOCAL_c_error_stream ) );
|
||||||
|
LOCAL_c_error_stream = Yap_CheckStream( inp, Output_Stream_f |
|
||||||
|
Append_Stream_f | Socket_Stream_f, "yap_flag/3" );
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
set_input_stream( Term inp ) {
|
||||||
|
if( IsVarTerm(inp) )
|
||||||
|
return Yap_unify( inp, Yap_StreamUserName( LOCAL_c_input_stream ) );
|
||||||
|
LOCAL_c_input_stream = Yap_CheckStream( inp, Input_Stream_f | Socket_Stream_f, "yap_flag/3" );
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
set_output_stream( Term inp ) {
|
||||||
|
if( IsVarTerm(inp) )
|
||||||
|
return Yap_unify( inp, Yap_StreamUserName( LOCAL_c_output_stream ) );
|
||||||
|
LOCAL_c_output_stream = Yap_CheckStream( inp, Output_Stream_f |
|
||||||
|
Append_Stream_f | Socket_Stream_f, "yap_flag/3" );
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static Term isground(Term inp) {
|
static Term isground(Term inp) {
|
||||||
return Yap_IsGroundTerm(inp) ? inp : TermZERO;
|
return Yap_IsGroundTerm(inp) ? inp : TermZERO;
|
||||||
}
|
}
|
||||||
@ -1473,7 +1514,7 @@ static void newFlag(Term fl, Term val) {
|
|||||||
GLOBAL_flagCount++;
|
GLOBAL_flagCount++;
|
||||||
f.name = (char *)RepAtom(AtomOfTerm(fl))->StrOfAE;
|
f.name = (char *)RepAtom(AtomOfTerm(fl))->StrOfAE;
|
||||||
f.writable = true;
|
f.writable = true;
|
||||||
f.helper = 0;
|
f.helper = NULL;
|
||||||
f.def = ok;
|
f.def = ok;
|
||||||
initFlag(&f, i, true);
|
initFlag(&f, i, true);
|
||||||
if (IsAtomOrIntTerm(val)) {
|
if (IsAtomOrIntTerm(val)) {
|
||||||
|
11
C/heapgc.c
11
C/heapgc.c
@ -463,7 +463,13 @@ push_registers(Int num_regs, yamop *nextop USES_REGS)
|
|||||||
while (curslot < topslot) {
|
while (curslot < topslot) {
|
||||||
// printf("%p <- %p\n", TR, topslot);
|
// printf("%p <- %p\n", TR, topslot);
|
||||||
ret = check_pr_trail(ret PASS_REGS);
|
ret = check_pr_trail(ret PASS_REGS);
|
||||||
TrailTerm(TR++) = *curslot++;
|
if (!IsVarTerm(*curslot) &&
|
||||||
|
(
|
||||||
|
(*curslot < (CELL)LOCAL_GlobalBase &&
|
||||||
|
*curslot > (CELL)HR))) {
|
||||||
|
*curslot++ = TermNil;
|
||||||
|
}
|
||||||
|
TrailTerm(TR++) = (CELL)curslot++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (i = 1; i <= num_regs; i++) {
|
for (i = 1; i <= num_regs; i++) {
|
||||||
@ -573,6 +579,7 @@ pop_registers(Int num_regs, yamop *nextop USES_REGS)
|
|||||||
while (curslot < topslot) {
|
while (curslot < topslot) {
|
||||||
*curslot++ = TrailTerm(ptr++);
|
*curslot++ = TrailTerm(ptr++);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 1; i <= num_regs; i++)
|
for (i = 1; i <= num_regs; i++)
|
||||||
@ -1193,7 +1200,7 @@ mark_variable(CELL_PTR current USES_REGS)
|
|||||||
char *local_bp = LOCAL_bp;
|
char *local_bp = LOCAL_bp;
|
||||||
|
|
||||||
begin:
|
begin:
|
||||||
if (UNMARKED_MARK(current,local_bp)) {
|
if (current == 0 || UNMARKED_MARK(current,local_bp)) {
|
||||||
POP_CONTINUATION();
|
POP_CONTINUATION();
|
||||||
}
|
}
|
||||||
if (current >= H0 && current < HR) {
|
if (current >= H0 && current < HR) {
|
||||||
|
@ -1267,6 +1267,8 @@ const char *Yap_tokRep(TokEntry *tokptr, encoding_t encoding) {
|
|||||||
case QuasiQuotes_tok:
|
case QuasiQuotes_tok:
|
||||||
case WQuasiQuotes_tok:
|
case WQuasiQuotes_tok:
|
||||||
return "<QQ>";
|
return "<QQ>";
|
||||||
|
default:
|
||||||
|
return "??";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
10
C/stack.c
10
C/stack.c
@ -779,19 +779,25 @@ static PredEntry *found_expand(yamop *pc, void **startp,
|
|||||||
return pp;
|
return pp;
|
||||||
}
|
}
|
||||||
|
|
||||||
static PredEntry *found_ystop(yamop *pc, int clause_code, void **startp,
|
static PredEntry *found_ystop(yamop *pc, int clause_code, void **startp, void **endp, PredEntry *pp USES_REGS) {
|
||||||
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)
|
||||||
*startp = (CODEADDR)YESCODE;
|
*startp = (CODEADDR)YESCODE;
|
||||||
|
if (endp)
|
||||||
*endp = (CODEADDR)YESCODE + (CELL)(NEXTOP((yamop *)NULL, e));
|
*endp = (CODEADDR)YESCODE + (CELL)(NEXTOP((yamop *)NULL, e));
|
||||||
return pp;
|
return pp;
|
||||||
}
|
}
|
||||||
if (!pp) {
|
if (!pp) {
|
||||||
|
yamop *o = PREVOP(pc,pp);
|
||||||
|
if (o->opc ==Yap_opcode(_execute_cpred)) {
|
||||||
|
pp = o->y_u.pp.p0;
|
||||||
|
} else {
|
||||||
/* must be an index */
|
/* must be an index */
|
||||||
PredEntry **pep = (PredEntry **)pc->y_u.l.l;
|
PredEntry **pep = (PredEntry **)pc->y_u.l.l;
|
||||||
pp = pep[-1];
|
pp = pep[-1];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (pp->PredFlags & LogUpdatePredFlag) {
|
if (pp->PredFlags & LogUpdatePredFlag) {
|
||||||
if (clause_code) {
|
if (clause_code) {
|
||||||
LogUpdClause *cl = ClauseCodeToLogUpdClause(pc->y_u.l.l);
|
LogUpdClause *cl = ClauseCodeToLogUpdClause(pc->y_u.l.l);
|
||||||
|
@ -142,5 +142,5 @@ set_target_properties(libYap
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
include(Config NO_POLICY_SCOPE)
|
|
||||||
MY_include(Packages NO_POLICY_SCOPE)
|
MY_include(Packages NO_POLICY_SCOPE)
|
||||||
|
include(Config NO_POLICY_SCOPE)
|
||||||
|
@ -8,8 +8,8 @@ set (CXX_SOURCES
|
|||||||
yapi.cpp
|
yapi.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND LIBYAP_SOURCES ${CXX_SOURCES} PARENT_SCOPE)
|
|
||||||
|
|
||||||
|
list(APPEND LIBYAP_SOURCES ${CXX_SOURCES} PARENT_SCOPE)
|
||||||
|
|
||||||
if (ANDROID OR WIN32)
|
if (ANDROID OR WIN32)
|
||||||
add_component (Yap++ ${CXX_SOURCES} )
|
add_component (Yap++ ${CXX_SOURCES} )
|
||||||
@ -24,7 +24,7 @@ MY_install(TARGETS Yap++
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
include_directories ( . ${CMAKE_BINARY_DIR} ${GMP_INCLUDE_DIRS})
|
include_directories ( . ${CMAKE_BINARY_DIR} ${GMP_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
|
||||||
|
|
||||||
set( CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${GMP_INCLUDE_DIRS} )
|
set( CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${GMP_INCLUDE_DIRS} )
|
||||||
|
|
||||||
|
131
CXX/yapi.cpp
131
CXX/yapi.cpp
@ -231,9 +231,10 @@ YAPPairTerm::YAPPairTerm() : YAPTerm() {
|
|||||||
RECOVER_H();
|
RECOVER_H();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Term YAPTerm::gt() { CACHE_REGS return Yap_GetFromSlot(t); }
|
||||||
|
|
||||||
void YAPTerm::mk(Term t0) { CACHE_REGS t= Yap_InitSlot(t0); }
|
void YAPTerm::mk(Term t0) { CACHE_REGS t= Yap_InitSlot(t0); }
|
||||||
|
|
||||||
Term YAPTerm::gt() { CACHE_REGS return Yap_GetFromSlot(t); }
|
|
||||||
|
|
||||||
YAP_tag_t YAPTerm::tag() {
|
YAP_tag_t YAPTerm::tag() {
|
||||||
Term tt = gt();
|
Term tt = gt();
|
||||||
@ -465,6 +466,9 @@ const char *YAPAtom::getName(void) {
|
|||||||
return Yap_AtomToUTF8Text( a, nullptr );
|
return Yap_AtomToUTF8Text( a, nullptr );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void YAPQuery::openQuery() {
|
void YAPQuery::openQuery() {
|
||||||
CACHE_REGS
|
CACHE_REGS
|
||||||
arity_t arity = ap->ArityOfPE;
|
arity_t arity = ap->ArityOfPE;
|
||||||
@ -492,6 +496,7 @@ void YAPQuery::openQuery() {
|
|||||||
q_handles = Yap_StartSlots();
|
q_handles = Yap_StartSlots();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool YAPEngine::call(YAPPredicate ap, YAPTerm ts[]) {
|
bool YAPEngine::call(YAPPredicate ap, YAPTerm ts[]) {
|
||||||
CACHE_REGS
|
CACHE_REGS
|
||||||
BACKUP_MACHINE_REGS();
|
BACKUP_MACHINE_REGS();
|
||||||
@ -501,12 +506,11 @@ bool YAPEngine::call(YAPPredicate ap, YAPTerm ts[]) {
|
|||||||
Term terr;
|
Term terr;
|
||||||
jmp_buf q_env;
|
jmp_buf q_env;
|
||||||
for (arity_t i = 0; i < arity; i++)
|
for (arity_t i = 0; i < arity; i++)
|
||||||
XREGS[i + 1] = ts[i].term();
|
Yap_XREGS[i + 1] = ts[i].term();
|
||||||
q.CurSlot = Yap_StartSlots();
|
q.CurSlot = Yap_StartSlots();
|
||||||
q.p = P;
|
q.p = P;
|
||||||
q.cp = CP;
|
q.cp = CP;
|
||||||
// make sure this is safe
|
// make sure this is safe
|
||||||
|
|
||||||
if (setjmp(q_env)) {
|
if (setjmp(q_env)) {
|
||||||
if ((terr = Yap_PeekException())) {
|
if ((terr = Yap_PeekException())) {
|
||||||
YAP_LeaveGoal(false, &q);
|
YAP_LeaveGoal(false, &q);
|
||||||
@ -515,15 +519,7 @@ bool YAPEngine::call(YAPPredicate ap, YAPTerm ts[]) {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// don't forget, on success these guys may create slots
|
// don't forget, on success these l);
|
||||||
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "exec ");
|
|
||||||
result = (bool)YAP_EnterGoal(ap.asPred(), nullptr, &q);
|
|
||||||
if ((terr = Yap_GetException())) {
|
|
||||||
YAP_LeaveGoal(false, &q);
|
|
||||||
throw YAPError();
|
|
||||||
}
|
|
||||||
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "out %d", result);
|
|
||||||
|
|
||||||
if (!result) {
|
if (!result) {
|
||||||
YAP_LeaveGoal(false, &q);
|
YAP_LeaveGoal(false, &q);
|
||||||
} else {
|
} else {
|
||||||
@ -533,14 +529,18 @@ bool YAPEngine::call(YAPPredicate ap, YAPTerm ts[]) {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool YAPEngine::goal(YAPTerm Yt) {
|
bool YAPEngine::goalt(YAPTerm Yt) {
|
||||||
|
return Yt.term();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool YAPEngine::goal(Term t) {
|
||||||
CACHE_REGS
|
CACHE_REGS
|
||||||
BACKUP_MACHINE_REGS();
|
BACKUP_MACHINE_REGS();
|
||||||
Term t = Yt.term(), terr, tmod = CurrentModule, *ts = nullptr;
|
Term terr, tmod = CurrentModule, *ts = nullptr;
|
||||||
PredEntry *ap = Yap_get_pred(t, tmod, "C++");
|
PredEntry *ap = Yap_get_pred(t, tmod, "C++");
|
||||||
arity_t arity = ap->ArityOfPE;
|
arity_t arity = ap->ArityOfPE;
|
||||||
bool result;
|
bool result;
|
||||||
YAP_dogoalinfo q;
|
|
||||||
jmp_buf q_env;
|
jmp_buf q_env;
|
||||||
|
|
||||||
if (IsApplTerm(t)) {
|
if (IsApplTerm(t)) {
|
||||||
@ -565,6 +565,8 @@ bool YAPEngine::goal(YAPTerm Yt) {
|
|||||||
}
|
}
|
||||||
// don't forget, on success these guys may create slots
|
// don't forget, on success these guys may create slots
|
||||||
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "exec ");
|
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "exec ");
|
||||||
|
|
||||||
|
|
||||||
result = (bool)YAP_EnterGoal(ap, nullptr, &q);
|
result = (bool)YAP_EnterGoal(ap, nullptr, &q);
|
||||||
if ((terr = Yap_GetException())) {
|
if ((terr = Yap_GetException())) {
|
||||||
YAP_LeaveGoal(false, &q);
|
YAP_LeaveGoal(false, &q);
|
||||||
@ -581,6 +583,84 @@ bool YAPEngine::goal(YAPTerm Yt) {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void YAPEngine::release() {
|
||||||
|
|
||||||
|
BACKUP_MACHINE_REGS();
|
||||||
|
YAP_LeaveGoal(FALSE, &q);
|
||||||
|
RECOVER_MACHINE_REGS();
|
||||||
|
}
|
||||||
|
|
||||||
|
Term YAPEngine::fun(Term t) {
|
||||||
|
CACHE_REGS
|
||||||
|
BACKUP_MACHINE_REGS();
|
||||||
|
Term tmod = CurrentModule, *ts = nullptr;
|
||||||
|
PredEntry *ap ;
|
||||||
|
arity_t arity = arity;
|
||||||
|
Functor f;
|
||||||
|
jmp_buf q_env;
|
||||||
|
Atom name;
|
||||||
|
|
||||||
|
|
||||||
|
BACKUP_MACHINE_REGS();
|
||||||
|
if (IsApplTerm(t)) {
|
||||||
|
ts = RepAppl(t) + 1;
|
||||||
|
f = (Functor)ts[-1];
|
||||||
|
name = NameOfFunctor(f);
|
||||||
|
arity =ArityOfFunctor(f);
|
||||||
|
for (arity_t i = 0; i < arity; i++)
|
||||||
|
XREGS[i + 1] = ts[i];
|
||||||
|
} else if (IsAtomTerm(t)) {
|
||||||
|
name = AtomOfTerm(t);
|
||||||
|
f = nullptr;
|
||||||
|
} else if (IsAtomTerm(t)) {
|
||||||
|
XREGS[1] = ts[0];
|
||||||
|
XREGS[2] = ts[1];
|
||||||
|
name = AtomDot;
|
||||||
|
f = FunctorDot;
|
||||||
|
}
|
||||||
|
XREGS[arity+1] = MkVarTerm();
|
||||||
|
arity ++;
|
||||||
|
f = Yap_MkFunctor(name,arity);
|
||||||
|
ap = (PredEntry *)(PredPropByFunc(f,tmod));
|
||||||
|
q.CurSlot = Yap_StartSlots();
|
||||||
|
q.p = P;
|
||||||
|
q.cp = CP;
|
||||||
|
// make sure this is safe
|
||||||
|
yhandle_t o = Yap_InitHandle(XREGS[arity]);
|
||||||
|
|
||||||
|
if (setjmp(q_env)) {
|
||||||
|
Term terr;
|
||||||
|
if ((terr = Yap_PeekException())) {
|
||||||
|
YAP_LeaveGoal(false, &q);
|
||||||
|
Yap_CloseHandles(q.CurSlot);
|
||||||
|
throw YAPError();
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
// don't forget, on success these guys may create slots
|
||||||
|
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "exec ");
|
||||||
|
|
||||||
|
if ((o = (Term)YAP_EnterGoal(ap, nullptr, &q))==0)
|
||||||
|
return 0;
|
||||||
|
Term terr;
|
||||||
|
if ((terr = Yap_GetException())) {
|
||||||
|
YAP_LeaveGoal(false, &q);
|
||||||
|
Yap_CloseHandles(q.CurSlot);
|
||||||
|
throw YAPError();
|
||||||
|
}
|
||||||
|
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "out %d", result);
|
||||||
|
|
||||||
|
Term result;
|
||||||
|
t = Yap_GetFromSlot(q.CurSlot);
|
||||||
|
Yap_CloseHandles(q.CurSlot);
|
||||||
|
if (!t) {
|
||||||
|
YAP_LeaveGoal(false, &q);
|
||||||
|
result = 0;
|
||||||
|
}
|
||||||
|
RECOVER_MACHINE_REGS();
|
||||||
|
return t;
|
||||||
|
}
|
||||||
|
|
||||||
YAPQuery::YAPQuery(YAPFunctor f, YAPTerm mod, YAPTerm ts[])
|
YAPQuery::YAPQuery(YAPFunctor f, YAPTerm mod, YAPTerm ts[])
|
||||||
: YAPPredicate(f, mod) {
|
: YAPPredicate(f, mod) {
|
||||||
/* ignore flags for now */
|
/* ignore flags for now */
|
||||||
@ -987,3 +1067,24 @@ const char *YAPError::text() {
|
|||||||
printf("%s\n", s.c_str());
|
printf("%s\n", s.c_str());
|
||||||
return s.c_str();
|
return s.c_str();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void YAPEngine::reSet()
|
||||||
|
{
|
||||||
|
/* ignore flags for now */
|
||||||
|
BACKUP_MACHINE_REGS();
|
||||||
|
Yap_RebootHandles(worker_id);
|
||||||
|
while (B->cp_b) B= B->cp_b;
|
||||||
|
P = FAILCODE;
|
||||||
|
Yap_exec_absmi(true, YAP_EXEC_ABSMI);
|
||||||
|
/* recover stack space */
|
||||||
|
HR = B->cp_h;
|
||||||
|
TR = B->cp_tr;
|
||||||
|
#ifdef DEPTH_LIMIT
|
||||||
|
DEPTH = B->cp_depth;
|
||||||
|
#endif /* DEPTH_LIMIT */
|
||||||
|
YENV = ENV = B->cp_env;
|
||||||
|
|
||||||
|
RECOVER_MACHINE_REGS();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
12
CXX/yapi.hh
12
CXX/yapi.hh
@ -1,5 +1,6 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define YAP_CPP_INTERFACE 1
|
#define YAP_CPP_INTERFACE 1
|
||||||
|
|
||||||
#include <gmpxx.h>
|
#include <gmpxx.h>
|
||||||
@ -67,6 +68,7 @@ extern "C" {
|
|||||||
#include "iopreds.h"
|
#include "iopreds.h"
|
||||||
|
|
||||||
#ifdef SWIGPYTHON
|
#ifdef SWIGPYTHON
|
||||||
|
extern PyObject *yap_to_pythond(YAP_Term t, bool eval);
|
||||||
extern PyObject *term_to_python(yhandle_t t, bool eval);
|
extern PyObject *term_to_python(yhandle_t t, bool eval);
|
||||||
extern PyObject *deref_term_to_python(yhandle_t t);
|
extern PyObject *deref_term_to_python(yhandle_t t);
|
||||||
X_API bool init_python(void);
|
X_API bool init_python(void);
|
||||||
@ -93,6 +95,8 @@ extern inline PyObject *AtomToPy(const char *s) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
X_API extern PyObject *yap_to_python(YAP_Term t, bool eval);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
X_API void YAP_UserCPredicate(const char *, YAP_UserCPred, YAP_Arity arity);
|
X_API void YAP_UserCPredicate(const char *, YAP_UserCPred, YAP_Arity arity);
|
||||||
@ -102,13 +106,9 @@ X_API void YAP_UserCPredicate(const char *, YAP_UserCPred, YAP_Arity arity);
|
|||||||
X_API void YAP_UserCPredicateWithArgs(const char *, YAP_UserCPred, YAP_Arity,
|
X_API void YAP_UserCPredicateWithArgs(const char *, YAP_UserCPred, YAP_Arity,
|
||||||
YAP_Term);
|
YAP_Term);
|
||||||
|
|
||||||
/* void UserBackCPredicate(const char *name, int *init(), int *cont(), int
|
X_API void UserBackCPredicate(const char *name, int *init(), int *cont(), int
|
||||||
arity, int extra) */
|
arity, int extra);
|
||||||
X_API void YAP_UserBackCPredicate(const char *, YAP_UserCPred, YAP_UserCPred,
|
|
||||||
YAP_Arity, YAP_Arity);
|
|
||||||
|
|
||||||
X_API Term Yap_StringToTerm(const char *s, size_t len, encoding_t *encp,
|
|
||||||
int prio, Term *bindings_p);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class YAPEngine;
|
class YAPEngine;
|
||||||
|
19
CXX/yapq.hh
19
CXX/yapq.hh
@ -135,6 +135,7 @@ private:
|
|||||||
YAP_init_args init_args;
|
YAP_init_args init_args;
|
||||||
YAPError yerror;
|
YAPError yerror;
|
||||||
void doInit(YAP_file_type_t BootMode);
|
void doInit(YAP_file_type_t BootMode);
|
||||||
|
YAP_dogoalinfo q;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/// construct a new engine; may use a variable number of arguments
|
/// construct a new engine; may use a variable number of arguments
|
||||||
@ -179,7 +180,17 @@ public:
|
|||||||
/// current directory for the engine
|
/// current directory for the engine
|
||||||
bool call(YAPPredicate ap, YAPTerm ts[]);
|
bool call(YAPPredicate ap, YAPTerm ts[]);
|
||||||
/// current directory for the engine
|
/// current directory for the engine
|
||||||
bool goal(YAPTerm t);
|
bool goalt(YAPTerm t);
|
||||||
|
/// current directory for the engine
|
||||||
|
bool goal(Term t);
|
||||||
|
#if SWIGPYTHON
|
||||||
|
bool unlockedGoal(Term t) {bool rc;Py_BEGIN_ALLOW_THREADS; rc = goal(t);Py_END_ALLOW_THREADS; return rc; }
|
||||||
|
#endif
|
||||||
|
/// reset Prolog state
|
||||||
|
void reSet();
|
||||||
|
/// release: assune that there are no stack pointers, just release memory
|
||||||
|
// for last execution
|
||||||
|
void release();
|
||||||
|
|
||||||
const char *currentDir() {
|
const char *currentDir() {
|
||||||
char dir[1024];
|
char dir[1024];
|
||||||
@ -191,11 +202,7 @@ public:
|
|||||||
std::string s = Yap_version();
|
std::string s = Yap_version();
|
||||||
return s.c_str();
|
return s.c_str();
|
||||||
};
|
};
|
||||||
#ifdef SWIGPYTHON
|
Term fun(Term t);
|
||||||
inline void share(PyObject *arg) {
|
|
||||||
LOCAL_shared = arg;
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* YAPQ_HH */
|
#endif /* YAPQ_HH */
|
||||||
|
@ -216,6 +216,10 @@ INLINE_ONLY inline EXTERN yhandle_t Yap_InitHandle__(Term t USES_REGS) {
|
|||||||
yhandle_t old_slots = LOCAL_CurHandle;
|
yhandle_t old_slots = LOCAL_CurHandle;
|
||||||
|
|
||||||
ensure_slots(1 PASS_REGS);
|
ensure_slots(1 PASS_REGS);
|
||||||
|
if (IsVarTerm(t) && (H0 > (CELL*)t || (CELL*)t > HR)) {
|
||||||
|
RESET_VARIABLE(HR);
|
||||||
|
Yap_unify(t,(CELL)HR); t = (CELL)HR++;
|
||||||
|
}
|
||||||
LOCAL_HandleBase[old_slots] = t;
|
LOCAL_HandleBase[old_slots] = t;
|
||||||
LOCAL_CurHandle++;
|
LOCAL_CurHandle++;
|
||||||
return old_slots;
|
return old_slots;
|
||||||
|
@ -83,7 +83,7 @@ which must be an atom. If unbound, unify the argument with the current
|
|||||||
working module.
|
working module.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
YAP_FLAG( USER_ERROR_FLAG, "user_error", true, isatom, "user_error" , NULL ), /**< `user_error1`
|
YAP_FLAG( USER_ERROR_FLAG, "user_error", true, stream, "user_error" , set_error_stream ), /**< `user_error1`
|
||||||
|
|
||||||
If the second argument is bound to a stream, set user_error to
|
If the second argument is bound to a stream, set user_error to
|
||||||
this stream. If the second argument is unbound, unify the argument with
|
this stream. If the second argument is unbound, unify the argument with
|
||||||
@ -114,5 +114,5 @@ prompts from the system were redirected to the stream
|
|||||||
automatically redirects the user_error alias to the original
|
automatically redirects the user_error alias to the original
|
||||||
`stderr`.
|
`stderr`.
|
||||||
*/
|
*/
|
||||||
YAP_FLAG( USER_INPUT_FLAG, "user_input", true, isatom, "user_input" , NULL ),
|
YAP_FLAG( USER_INPUT_FLAG, "user_input", true, stream, "user_input" , set_input_stream ),
|
||||||
YAP_FLAG( USER_OUTPUT_FLAG, "user_output", true, isatom, "user_output" , NULL ),
|
YAP_FLAG( USER_OUTPUT_FLAG, "user_output", true, stream, "user_output" , set_output_stream ),
|
||||||
|
@ -2,10 +2,6 @@
|
|||||||
message(STATUS "Building YAP packages version ${YAP_VERSION}")
|
message(STATUS "Building YAP packages version ${YAP_VERSION}")
|
||||||
|
|
||||||
|
|
||||||
include (cudd NO-POLICY-SCOPE)
|
|
||||||
include (python NO-POLICY-SCOPE)
|
|
||||||
include (java NO-POLICY-SCOPE)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (NOT WIN32)
|
if (NOT WIN32)
|
||||||
@ -156,7 +152,6 @@ target_link_libraries(yap-bin libYap )
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
CMAKE_DEPENDENT_OPTION (WITH_SYSTEM_MMAP "Use MMAP for shared memory allocation" ON
|
CMAKE_DEPENDENT_OPTION (WITH_SYSTEM_MMAP "Use MMAP for shared memory allocation" ON
|
||||||
"NOT WITH_YAPOR_THOR" OFF)
|
"NOT WITH_YAPOR_THOR" OFF)
|
||||||
|
|
||||||
|
@ -174,3 +174,8 @@ set(YAP_ROOTDIR "${prefix}")
|
|||||||
# include( Sources NO_POLICY_SCOPE )
|
# include( Sources NO_POLICY_SCOPE )
|
||||||
#
|
#
|
||||||
# include( Model NO_POLICY_SCOPE )
|
# include( Model NO_POLICY_SCOPE )
|
||||||
|
|
||||||
|
include (cudd NO-POLICY-SCOPE)
|
||||||
|
include (python NO-POLICY-SCOPE)
|
||||||
|
include (java NO-POLICY-SCOPE)
|
||||||
|
|
||||||
|
@ -26,3 +26,8 @@ find_package(PythonLibs)
|
|||||||
macro_log_feature (PYTHONLIBS_FOUND "Python"
|
macro_log_feature (PYTHONLIBS_FOUND "Python"
|
||||||
"Use Python System"
|
"Use Python System"
|
||||||
"http://www.python.org" FALSE)
|
"http://www.python.org" FALSE)
|
||||||
|
|
||||||
|
#include_directories( ${PYTHON_INCLUDE_DIRS} )
|
||||||
|
|
||||||
|
set( CMAKE_REQUIRED_INCLUDES ${PYTHON_INCLUDE_DIRS} ${CMAKE_REQUIRED_INCLUDES} )
|
||||||
|
check_include_file(Python.h HAVE_PYTHON_H)
|
||||||
|
@ -1013,6 +1013,11 @@ function. */
|
|||||||
#cmakedefine HAVE_PWD_H ${HAVE_PWD_H}
|
#cmakedefine HAVE_PWD_H ${HAVE_PWD_H}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <pwd.h> header file. */
|
||||||
|
#ifndef HAVE_PYTHON_H
|
||||||
|
#cmakedefine HAVE_PYTHON_H ${HAVE_PYTHON_H}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Define to 1 if you have the `rand' function. */
|
/* Define to 1 if you have the `rand' function. */
|
||||||
#ifndef HAVE_RAND
|
#ifndef HAVE_RAND
|
||||||
#cmakedefine HAVE_RAND ${HAVE_RAND}
|
#cmakedefine HAVE_RAND ${HAVE_RAND}
|
||||||
@ -1033,7 +1038,6 @@ function. */
|
|||||||
#cmakedefine HAVE_RAPTOR_H ${HAVE_RAPTOR_H}
|
#cmakedefine HAVE_RAPTOR_H ${HAVE_RAPTOR_H}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* Define to 1 if you have the `readlink' function. */
|
/* Define to 1 if you have the `readlink' function. */
|
||||||
#ifndef HAVE_READLINK
|
#ifndef HAVE_READLINK
|
||||||
#cmakedefine HAVE_READLINK ${HAVE_READLINK}
|
#cmakedefine HAVE_READLINK ${HAVE_READLINK}
|
||||||
|
@ -258,7 +258,7 @@ X_API int PL_unify_chars(term_t l, int flags, size_t length, const char *s) {
|
|||||||
|
|
||||||
if (flags & REP_UTF8) {
|
if (flags & REP_UTF8) {
|
||||||
inp.val.c0 = s;
|
inp.val.c0 = s;
|
||||||
inp.type = YAP_STRING_CHARS | ENC_ISO_LATIN1;
|
inp.type = YAP_STRING_CHARS | ENC_ISO_UTF8;
|
||||||
if (length != (size_t)-1) {
|
if (length != (size_t)-1) {
|
||||||
inp.type |= YAP_STRING_NCHARS;
|
inp.type |= YAP_STRING_NCHARS;
|
||||||
}
|
}
|
||||||
|
@ -110,7 +110,7 @@ include(CheckVariableExists)
|
|||||||
check_function_exists( rl_reset_after_signal HAVE_RL_RESET_AFTER_SIGNAL )
|
check_function_exists( rl_reset_after_signal HAVE_RL_RESET_AFTER_SIGNAL )
|
||||||
check_function_exists( rl_set_keyboard_input_timeout HAVE_RL_SET_KEYBOARD_INPUT_TIMEOUT )
|
check_function_exists( rl_set_keyboard_input_timeout HAVE_RL_SET_KEYBOARD_INPUT_TIMEOUT )
|
||||||
check_function_exists( rl_set_prompt HAVE_RL_SET_PROMPT)
|
check_function_exists( rl_set_prompt HAVE_RL_SET_PROMPT)
|
||||||
check_symbol_exists( rl_catch_signals "readline/readline.h" HAVE_DECL_RL_CATCH_SIGNALS )
|
check_symbol_exists( rl_catch_signals "stdio.h;readline/readline.h" HAVE_DECL_RL_CATCH_SIGNALS )
|
||||||
check_type_size( rl_completion_func_t RL_COMPLETION_FUNC_T )
|
check_type_size( rl_completion_func_t RL_COMPLETION_FUNC_T )
|
||||||
check_symbol_exists( rl_done stdio.h;readline/readline.h HAVE_DECL_RL_DONE )
|
check_symbol_exists( rl_done stdio.h;readline/readline.h HAVE_DECL_RL_DONE )
|
||||||
CHECK_TYPE_SIZE( rl_hook_func_t RL_HOOK_FUNC_T )
|
CHECK_TYPE_SIZE( rl_hook_func_t RL_HOOK_FUNC_T )
|
||||||
|
@ -1061,7 +1061,7 @@ static Int line_count(USES_REGS1) { /* '$current_line_number'(+Stream,-N) */
|
|||||||
return (Yap_unify_constant(ARG2, tout));
|
return (Yap_unify_constant(ARG2, tout));
|
||||||
}
|
}
|
||||||
|
|
||||||
static Int p_line_position(USES_REGS1) { /* '$line_position'(+Stream,-N) */
|
static Int line_position(USES_REGS1) { /* '$line_position'(+Stream,-N) */
|
||||||
Term tout;
|
Term tout;
|
||||||
int sno =
|
int sno =
|
||||||
Yap_CheckStream(ARG1, Input_Stream_f | Output_Stream_f | Append_Stream_f,
|
Yap_CheckStream(ARG1, Input_Stream_f | Output_Stream_f | Append_Stream_f,
|
||||||
@ -1084,7 +1084,7 @@ static Int p_line_position(USES_REGS1) { /* '$line_position'(+Stream,-N) */
|
|||||||
return (Yap_unify_constant(ARG2, tout));
|
return (Yap_unify_constant(ARG2, tout));
|
||||||
}
|
}
|
||||||
|
|
||||||
static Int p_character_count(USES_REGS1) { /* '$character_count'(+Stream,-N) */
|
static Int character_count(USES_REGS1) { /* '$character_count'(+Stream,-N) */
|
||||||
Term tout;
|
Term tout;
|
||||||
int sno =
|
int sno =
|
||||||
Yap_CheckStream(ARG1, Input_Stream_f | Output_Stream_f | Append_Stream_f,
|
Yap_CheckStream(ARG1, Input_Stream_f | Output_Stream_f | Append_Stream_f,
|
||||||
@ -1420,9 +1420,9 @@ void Yap_InitIOStreams(void) {
|
|||||||
SafePredFlag | SyncPredFlag | HiddenPredFlag);
|
SafePredFlag | SyncPredFlag | HiddenPredFlag);
|
||||||
Yap_InitCPred("$check_stream", 1, p_check_if_stream,
|
Yap_InitCPred("$check_stream", 1, p_check_if_stream,
|
||||||
SafePredFlag | SyncPredFlag | HiddenPredFlag | HiddenPredFlag);
|
SafePredFlag | SyncPredFlag | HiddenPredFlag | HiddenPredFlag);
|
||||||
Yap_InitCPred("$line_position", 2, p_line_position,
|
Yap_InitCPred("line_position", 2, line_position,
|
||||||
SafePredFlag | SyncPredFlag | HiddenPredFlag);
|
SafePredFlag | SyncPredFlag | HiddenPredFlag);
|
||||||
Yap_InitCPred("$character_count", 2, p_character_count,
|
Yap_InitCPred("character_count", 2, character_count,
|
||||||
SafePredFlag | SyncPredFlag | HiddenPredFlag);
|
SafePredFlag | SyncPredFlag | HiddenPredFlag);
|
||||||
Yap_InitCPred("$show_stream_flags", 2, p_show_stream_flags,
|
Yap_InitCPred("$show_stream_flags", 2, p_show_stream_flags,
|
||||||
SafePredFlag | SyncPredFlag | HiddenPredFlag);
|
SafePredFlag | SyncPredFlag | HiddenPredFlag);
|
||||||
|
@ -2,6 +2,12 @@
|
|||||||
|
|
||||||
#include "python.h"
|
#include "python.h"
|
||||||
|
|
||||||
|
PyObject *yap_to_python(YAP_Term t, bool eval) {
|
||||||
|
term_t yt = PL_new_term_ref();
|
||||||
|
PyObject *o = term_to_python(yt, eval);
|
||||||
|
PL_reset_term_refs(yt);
|
||||||
|
return o;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* term_to_python translates and evaluates from Prolog to Python
|
* term_to_python translates and evaluates from Prolog to Python
|
||||||
@ -13,7 +19,6 @@
|
|||||||
*/
|
*/
|
||||||
PyObject *term_to_python(term_t t, bool eval) {
|
PyObject *term_to_python(term_t t, bool eval) {
|
||||||
// Yap_DebugPlWrite(YAP_GetFromSlot(t)); fprintf(stderr, " here I
|
// Yap_DebugPlWrite(YAP_GetFromSlot(t)); fprintf(stderr, " here I
|
||||||
// am\n");
|
|
||||||
YAP_Term yt = YAP_GetFromSlot(t);
|
YAP_Term yt = YAP_GetFromSlot(t);
|
||||||
switch (PL_term_type(t)) {
|
switch (PL_term_type(t)) {
|
||||||
case PL_VARIABLE: {
|
case PL_VARIABLE: {
|
||||||
@ -64,7 +69,7 @@ PyObject *term_to_python(term_t t, bool eval) {
|
|||||||
if (!c && PyObject_HasAttrString(py_Yapex, "A"))
|
if (!c && PyObject_HasAttrString(py_Yapex, "A"))
|
||||||
c = PyObject_GetAttrString(py_Yapex, "A");
|
c = PyObject_GetAttrString(py_Yapex, "A");
|
||||||
if (!c || !PyCallable_Check(c)) {
|
if (!c || !PyCallable_Check(c)) {
|
||||||
return NULL;
|
return o;
|
||||||
} else {
|
} else {
|
||||||
PyObject *t = PyTuple_New(1);
|
PyObject *t = PyTuple_New(1);
|
||||||
PyTuple_SET_ITEM(t, 0, PyUnicode_FromString(s));
|
PyTuple_SET_ITEM(t, 0, PyUnicode_FromString(s));
|
||||||
@ -79,7 +84,7 @@ PyObject *term_to_python(term_t t, bool eval) {
|
|||||||
case PL_STRING: {
|
case PL_STRING: {
|
||||||
char *s = NULL;
|
char *s = NULL;
|
||||||
if (!PL_get_chars(t, &s,
|
if (!PL_get_chars(t, &s,
|
||||||
REP_UTF8 | CVT_ATOM | CVT_STRING | BUF_DISCARDABLE)) {
|
REP_UTF8 | CVT_ATOM | CVT_STRING | BUF_MALLOC)) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
#if PY_MAJOR_VERSION < 3
|
#if PY_MAJOR_VERSION < 3
|
||||||
@ -90,6 +95,10 @@ PyObject *term_to_python(term_t t, bool eval) {
|
|||||||
{
|
{
|
||||||
PyObject *pobj = PyUnicode_DecodeUTF8(s, strlen(s), NULL);
|
PyObject *pobj = PyUnicode_DecodeUTF8(s, strlen(s), NULL);
|
||||||
// fprintf(stderr, "%s\n", s);
|
// fprintf(stderr, "%s\n", s);
|
||||||
|
free(s);
|
||||||
|
if (pobj) {
|
||||||
|
Py_IncRef(pobj);
|
||||||
|
}
|
||||||
return pobj;
|
return pobj;
|
||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
|
@ -254,7 +254,7 @@ foreign_t python_to_term(PyObject *pVal, term_t t) {
|
|||||||
return rc;
|
return rc;
|
||||||
#else
|
#else
|
||||||
// new interface
|
// new interface
|
||||||
char *s = PyUnicode_AsUTF8AndSize(pVal, &sz);
|
char *s = PyUnicode_AsUTF8AndSize(pValR, &sz);
|
||||||
return repr_term(s, sz, t);
|
return repr_term(s, sz, t);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -651,7 +651,7 @@ term_to_nametuple( const char *s, int arity, term_t t) {
|
|||||||
PyTypeObject *typp;
|
PyTypeObject *typp;
|
||||||
PyObject *o;
|
PyObject *o;
|
||||||
PyObject *key = PyUnicode_FromString(s);
|
PyObject *key = PyUnicode_FromString(s);
|
||||||
if (PyDict_Contains(py_F2P, key)) {
|
if (py_F2P && PyDict_Contains(py_F2P, key)) {
|
||||||
typp = (PyTypeObject*)PyDict_GetItem(py_F2P, key);
|
typp = (PyTypeObject*)PyDict_GetItem(py_F2P, key);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
@ -670,6 +670,7 @@ if (PyDict_Contains(py_F2P, key)) {
|
|||||||
Py_INCREF(typp);
|
Py_INCREF(typp);
|
||||||
// typp->tp_flags |= Py_TPFLAGS_HEAPTYPE;
|
// typp->tp_flags |= Py_TPFLAGS_HEAPTYPE;
|
||||||
PyModule_AddObject(py_Yapex, s, (PyObject *)typp);
|
PyModule_AddObject(py_Yapex, s, (PyObject *)typp);
|
||||||
|
if (py_F2P)
|
||||||
PyDict_SetItem(py_F2P, key, (PyObject *)typp);
|
PyDict_SetItem(py_F2P, key, (PyObject *)typp);
|
||||||
}
|
}
|
||||||
o = PyStructSequence_New(typp);
|
o = PyStructSequence_New(typp);
|
||||||
@ -1264,7 +1265,9 @@ PyObject *compound_to_pyeval(term_t t, functor_t fun) {
|
|||||||
/* pArg reference stolen here: */
|
/* pArg reference stolen here: */
|
||||||
PyTuple_SetItem(pArgs, i, pArg);
|
PyTuple_SetItem(pArgs, i, pArg);
|
||||||
}
|
}
|
||||||
return PyObject_CallObject(o, pArgs);
|
PyObject *rc;
|
||||||
|
rc = PyObject_CallObject(o, pArgs);
|
||||||
|
return rc;
|
||||||
} else {
|
} else {
|
||||||
atom_t name;
|
atom_t name;
|
||||||
int len;
|
int len;
|
||||||
|
@ -94,6 +94,8 @@ static inline PyObject *atom_to_python_string(term_t t) {
|
|||||||
extern PyObject *compound_to_pyeval(term_t t, functor_t fun);
|
extern PyObject *compound_to_pyeval(term_t t, functor_t fun);
|
||||||
extern PyObject *compound_to_pytree(term_t t, functor_t fun);
|
extern PyObject *compound_to_pytree(term_t t, functor_t fun);
|
||||||
|
|
||||||
|
|
||||||
|
extern PyObject *yap_to_python(YAP_Term t, bool eval);
|
||||||
extern PyObject *term_to_python(term_t t, bool eval);
|
extern PyObject *term_to_python(term_t t, bool eval);
|
||||||
extern foreign_t python_to_ptr(PyObject *pVal, term_t t);
|
extern foreign_t python_to_ptr(PyObject *pVal, term_t t);
|
||||||
|
|
||||||
|
@ -14,7 +14,8 @@ setup(
|
|||||||
ext_modules=[Extension('_yap', ['yap.i'],
|
ext_modules=[Extension('_yap', ['yap.i'],
|
||||||
define_macros = [('MAJOR_VERSION', '1'),
|
define_macros = [('MAJOR_VERSION', '1'),
|
||||||
('MINOR_VERSION', '0'),
|
('MINOR_VERSION', '0'),
|
||||||
('_YAP_NOT_INSTALLED_', '1')],
|
('_YAP_NOT_INSTALLED_', '1'),
|
||||||
|
('YAP_PYTHON', '1')],
|
||||||
runtime_library_dirs=['${dlls}'],
|
runtime_library_dirs=['${dlls}'],
|
||||||
swig_opts=['-modern','-outcurrentdir', '-c++', '-py3','-I${CMAKE_SOURCE_DIR}/CXX'],
|
swig_opts=['-modern','-outcurrentdir', '-c++', '-py3','-I${CMAKE_SOURCE_DIR}/CXX'],
|
||||||
library_dirs=['../../..','../../../CXX',
|
library_dirs=['../../..','../../../CXX',
|
||||||
|
@ -14,51 +14,49 @@ class YAPEngine;
|
|||||||
|
|
||||||
#ifdef SWIGPYTHON
|
#ifdef SWIGPYTHON
|
||||||
|
|
||||||
%typemap(typecheck) YAPTerm* {
|
%typemap(typecheck) Term* {
|
||||||
$1 = PySequence_Check($input);
|
$1 = PySequence_Check($input);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Map a Python sequence into any sized C double array
|
// Map a Python sequence into any sized C double array
|
||||||
%typemap(in) YAPTerm* {
|
%typemap(in) Term* {
|
||||||
int i;
|
int i;
|
||||||
if (!PySequence_Check($input)) {
|
if (!PySequence_Check($input)) {
|
||||||
PyErr_SetString(PyExc_TypeError,"Expecting a sequence");
|
PyErr_SetString(PyExc_TypeError,"Expecting a sequence");
|
||||||
$1 = nullptr;
|
$1 = nullptr;
|
||||||
} else {
|
} else {
|
||||||
int sz = PyObject_Length($input);
|
int sz = PyObject_Length($input);
|
||||||
std::vector<YAPTerm> v(sz);
|
std::vector<Term> v(sz);
|
||||||
for (i =0; i < sz; i++) {
|
for (i =0; i < sz; i++) {
|
||||||
PyObject *o = PySequence_GetItem($input,i);
|
PyObject *o = PySequence_GetItem($input,i);
|
||||||
v[i] = YAPTerm(pythonToYAP(o));
|
v[i] = Term(pythonToYAP(o));
|
||||||
Py_DECREF(o);
|
Py_DECREF(o);
|
||||||
}
|
}
|
||||||
$1 = &v[0];
|
$1 = &v[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
%typemap(typecheck) YAPTerm {
|
%typemap(typecheck) YPTerm {
|
||||||
$1 = true;
|
$1 = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
%typemap(in) Term { $1 = pythonToYAP($input); }
|
||||||
|
|
||||||
|
|
||||||
%typemap(in) YAPTerm { $1 = YAPTerm(pythonToYAP($input)); }
|
%typemap(out) Term { return $result = yap_to_python($1, false);}
|
||||||
|
|
||||||
|
|
||||||
%typemap(out) YAPTerm {$result = term_to_python($1.handle(), false);}
|
%extend(out) Term{Term & __getitem__(size_t i){Term t0 = $self;
|
||||||
|
|
||||||
|
|
||||||
%extend(out) YAPTerm{YAPTerm & __getitem__(size_t i){Term t0 = $self->term();
|
|
||||||
|
|
||||||
if (IsApplTerm(t0)) {
|
if (IsApplTerm(t0)) {
|
||||||
Functor f = FunctorOfTerm(t0);
|
Functor f = FunctorOfTerm(t0);
|
||||||
if (!IsExtensionFunctor(f))
|
if (!IsExtensionFunctor(f))
|
||||||
return *new YAPTerm(ArgOfTerm(i + 1, t0));
|
return (ArgOfTerm(i + 1, t0);
|
||||||
} else if (IsPairTerm(t0)) {
|
} else if (IsPairTerm(t0)) {
|
||||||
if (i == 0)
|
if (i == 0)
|
||||||
return *new YAPTerm(HeadOfTerm(t0));
|
return HeadOfTerm(t0);
|
||||||
else if (i == 1)
|
else if (i == 1)
|
||||||
return *new YAPTerm(TailOfTerm(t0));
|
return TailOfTerm(t0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
/** @pred listing
|
/** @pred listing
|
||||||
|
|
||||||
|
|
||||||
Lists in the current output stream all the clauses for which source code
|
vxuLists in the current output stream all the clauses for which source code
|
||||||
is available (these include all clauses for dynamic predicates and
|
is available (these include all clauses for dynamic predicates and
|
||||||
clauses for static predicates compiled when source mode was `on`).
|
clauses for static predicates compiled when source mode was `on`).
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user