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

Android support,

Browse Source
This commit is contained in:
Vitor Santos Costa 2017-07-25 01:10:44 +01:00
parent c0cf2b0b83
commit 963752fa9c
27 changed files with 851 additions and 722 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
C/scanner.c
View File

@ -871,7 +871,7 @@ static int num_send_error_message(char s[]) {
#define number_overflow() \ #define number_overflow() \
{ \ { \
size_t nsz = min(max_size * 2, max_size); \ size_t nsz = Yap_Min(max_size * 2, max_size); \
char *nbuf; \ char *nbuf; \
\ \
if (buf == buf0) { \ if (buf == buf0) { \
@ -1406,7 +1406,7 @@ TokEntry *Yap_tokenizer(struct stream_desc *inp_stream, bool store_comments,
for (; chtype(ch) <= NU; ch = getchr(inp_stream)) { for (; chtype(ch) <= NU; ch = getchr(inp_stream)) {
if (charp == TokImage + (sz - 1)) { if (charp == TokImage + (sz - 1)) {
unsigned char *p0 = TokImage; unsigned char *p0 = TokImage;
sz = min(sz * 2, sz + MBYTE); sz = Yap_Min(sz * 2, sz + MBYTE);
TokImage = Realloc(p0, sz); TokImage = Realloc(p0, sz);
if (TokImage == NULL) { if (TokImage == NULL) {
return CodeSpaceError(t, p, l); return CodeSpaceError(t, p, l);
@ -1560,7 +1560,7 @@ TokEntry *Yap_tokenizer(struct stream_desc *inp_stream, bool store_comments,
while (TRUE) { while (TRUE) {
if (charp > TokImage + (sz - 1)) { if (charp > TokImage + (sz - 1)) {
TokImage = Realloc(TokImage, min(sz * 2, sz + MBYTE)); TokImage = Realloc(TokImage, Yap_Min(sz * 2, sz + MBYTE));
if (TokImage == NULL) { if (TokImage == NULL) {
return CodeSpaceError(t, p, l); return CodeSpaceError(t, p, l);
} }
@ -1735,7 +1735,7 @@ TokEntry *Yap_tokenizer(struct stream_desc *inp_stream, bool store_comments,
add_ch_to_buff(och); add_ch_to_buff(och);
for (; chtype(ch) == SY; ch = getchr(inp_stream)) { for (; chtype(ch) == SY; ch = getchr(inp_stream)) {
if (charp >= TokImage + (sz - 10)) { if (charp >= TokImage + (sz - 10)) {
sz = min(sz * 2, sz + MBYTE); sz = Yap_Min(sz * 2, sz + MBYTE);
TokImage = Realloc(TokImage, sz); TokImage = Realloc(TokImage, sz);
if (!TokImage) if (!TokImage)
return CodeSpaceError(t, p, l); return CodeSpaceError(t, p, l);

30
CMakeLists.txt
View File

@ -91,12 +91,12 @@ endif()
OPTION (WITH_SWIG " Enable SWIG interfaces to foreign languages" ON) OPTION (WITH_SWIG " Enable SWIG interfaces to foreign languages" ON)
IF (WITH_SWIG) IF (WITH_SWIG OR ANDROID)
find_host_package (SWIG) find_host_package (SWIG)
macro_log_feature (SWIG_FOUND "Swig" macro_log_feature (SWIG_FOUND "Swig"
"Use SWIG Interface Generator " "Use SWIG Interface Generator "
"http://www.swig.org" ON) "http://www.swig.org" ON)
ENDIF (WITH_SWIG) ENDIF (WITH_SWIG OR ANDROID)
option (WITH_PYTHON option (WITH_PYTHON
"Allow Python->YAP and YAP->Python" ON) "Allow Python->YAP and YAP->Python" ON)
@ -106,37 +106,20 @@ IF (WITH_PYTHON)
ENDIF (WITH_PYTHON) ENDIF (WITH_PYTHON)
IF (SWIG_FOUND)
add_subDIRECTORY (packages/swig NO_POLICY_SCOPE)
ENDIF(SWIG_FOUND)
if (ANDROID)
ADD_SUBDIRECTORY(os)
ADD_SUBDIRECTORY(OPTYap)
ADD_SUBDIRECTORY(packages/myddas)
ADD_SUBDIRECTORY(utf8proc)
ADD_SUBDIRECTORY(CXX)
else()
List (APPEND YLIBS $<TARGET_OBJECTS:libOPTYap> ) List (APPEND YLIBS $<TARGET_OBJECTS:libOPTYap> )
List (APPEND YLIBS $<TARGET_OBJECTS:libYAPOs> ) List (APPEND YLIBS $<TARGET_OBJECTS:libYAPOs> )
List (APPEND YLIBS $<TARGET_OBJECTS:utf8proc> ) List (APPEND YLIBS $<TARGET_OBJECTS:utf8proc> )
List (APPEND YLIBS $<TARGET_OBJECTS:myddas> ) List (APPEND YLIBS $<TARGET_OBJECTS:myddas> )
List (APPEND YLIBS $<TARGET_OBJECTS:Yapsqlite3> )
List (APPEND YLIBS $<TARGET_OBJECTS:libswi> ) List (APPEND YLIBS $<TARGET_OBJECTS:libswi> )
if (WIN32) if (WIN32)
List (APPEND YLIBS $<TARGET_OBJECTS:Yapsqlite3> )
List (APPEND YLIBS $<TARGET_OBJECTS:YAP++> ) List (APPEND YLIBS $<TARGET_OBJECTS:YAP++> )
if (WITH_PYTHON ) if (WITH_PYTHON )
List (APPEND YLIBS $<TARGET_OBJECTS:Obj4Py> ) List (APPEND YLIBS $<TARGET_OBJECTS:Obj4Py> )
endif() endif()
endif() endif()
endif()
@ -167,8 +150,6 @@ if (USE_READLINE)
endif (USE_READLINE) endif (USE_READLINE)
if (ANDROID) if (ANDROID)
add_dependencies(libYap plmyddas )
target_link_libraries(libYap android log) target_link_libraries(libYap android log)
endif () endif ()
@ -192,4 +173,9 @@ if (PYTHONLIBS_FOUND AND SWIG_FOUND)
ENDIF() ENDIF()
endif() endif()
IF (SWIG_FOUND OR ANDROID)
add_subDIRECTORY (packages/swig NO_POLICY_SCOPE)
ENDIF()
include(Config NO_POLICY_SCOPE) include(Config NO_POLICY_SCOPE)

168
CXX/yapi.cpp
View File

@ -27,12 +27,14 @@ X_API void YAP_UserBackCPredicate(const char *, YAP_UserCPred, YAP_UserCPred,
} }
static YAPEngine *curren;
YAPAtomTerm::YAPAtomTerm(char *s) YAPAtomTerm::YAPAtomTerm(char *s)
{ // build string { // build string
BACKUP_H(); BACKUP_H();
CACHE_REGS CACHE_REGS
seq_tv_t inp, out; seq_tv_t inp, out;
inp.val.c = s; inp.val.c = s;
inp.type = YAP_STRING_CHARS; inp.type = YAP_STRING_CHARS;
out.type = YAP_STRING_ATOM; out.type = YAP_STRING_ATOM;
@ -187,6 +189,7 @@ YAPApplTerm::YAPApplTerm(std::string f, std::vector<YAPTerm> ts)
mk(o); mk(o);
} }
YAPApplTerm::YAPApplTerm(YAPFunctor f) : YAPTerm() YAPApplTerm::YAPApplTerm(YAPFunctor f) : YAPTerm()
{ {
BACKUP_H(); BACKUP_H();
@ -633,20 +636,20 @@ YAPQuery::YAPQuery(YAPFunctor f, YAPTerm mod, YAPTerm ts[])
/* ignore flags for now */ /* ignore flags for now */
BACKUP_MACHINE_REGS(); BACKUP_MACHINE_REGS();
Term *nts; Term *nts;
Term goal; Term tgoal;
if ( ts) { if ( ts) {
goal = YAPApplTerm(f, ts).term(); goal = new YAPApplTerm(f, ts);
nts = RepAppl(goal)+1; nts = RepAppl(goal->term())+1;
} else { } else {
goal = MkVarTerm(); goal = new YAPVarTerm();
nts = nullptr; nts = nullptr;
} }
openQuery(goal, nts); openQuery(goal->term(), nts);
names = YAPPairTerm( TermNil ); names = new YAPPairTerm();
RECOVER_MACHINE_REGS(); RECOVER_MACHINE_REGS();
} }
#if 0 #if 0
@ -655,12 +658,13 @@ YAPQuery::YAPQuery(YAPFunctor f, YAPTerm ts[]) : YAPPredicate(f) {
BACKUP_MACHINE_REGS(); BACKUP_MACHINE_REGS();
CELL *nts; CELL *nts;
if (ts) { if (ts) {
goal = YAPApplTerm(f, nts); tgoal = YAPApplTerm(f, nts);
} else { } else {
goal = YAPVarTerm(); tgoal = YAPVarTerm();
nts = nullptr; nts = nullptr;
} }
names = YAPPairTerm( TermNil ); *names = new YAPPairTerm();
*goal = new YAPTerm(tgoal);
openQuery(goal.term(), nts); openQuery(goal.term(), nts);
RECOVER_MACHINE_REGS(); RECOVER_MACHINE_REGS();
} }
@ -671,19 +675,19 @@ YAPQuery::YAPQuery(YAPTerm t) : YAPPredicate(t)
BACKUP_MACHINE_REGS(); BACKUP_MACHINE_REGS();
CELL *nts; CELL *nts;
Term tt = t.term(); Term tt = t.term();
goal = t;
if (IsApplTerm(tt)) { if (IsApplTerm(tt)) {
Functor f = FunctorOfTerm(tt); Functor f = FunctorOfTerm(tt);
if (IsExtensionFunctor(f)) if (IsExtensionFunctor(f))
nts = nullptr; nts = nullptr;
nts = RepAppl(goal.term())+1; nts = RepAppl(tt)+1;
} else if (IsPairTerm(tt)) { } else if (IsPairTerm(tt)) {
nts = RepPair(tt); nts = RepPair(tt);
} else { } else {
nts = nullptr; nts = nullptr;
} }
openQuery(tt, nts); openQuery(tt, nts);
names = YAPPairTerm( TermNil ); names = new YAPPairTerm();
goal = new YAPTerm(t);
RECOVER_MACHINE_REGS(); RECOVER_MACHINE_REGS();
} }
@ -692,15 +696,15 @@ YAPQuery::YAPQuery(YAPPredicate p, YAPTerm ts[]) : YAPPredicate(p.ap) {
BACKUP_MACHINE_REGS(); BACKUP_MACHINE_REGS();
arity_t arity = p.ap->ArityOfPE; arity_t arity = p.ap->ArityOfPE;
if (arity) { if (arity) {
goal = YAPApplTerm(YAPFunctor(p.ap->FunctorOfPred), ts).term(); goal = new YAPApplTerm(YAPFunctor(p.ap->FunctorOfPred), ts);
for (arity_t i =0; i < arity; i++) for (arity_t i =0; i < arity; i++) {
XREGS[i+1]=ts[i].term(); XREGS[i + 1] = ts[i].term();
openQuery(goal.term(), nullptr); }
} else { } else {
goal = YAPAtomTerm((Atom)(p.ap->FunctorOfPred)); goal = new YAPAtomTerm((Atom)(p.ap->FunctorOfPred));
openQuery(goal.term(), nullptr);
} }
names = TermNil; openQuery(goal->term(), nullptr);
names = new YAPPairTerm();
RECOVER_MACHINE_REGS(); RECOVER_MACHINE_REGS();
} }
@ -709,6 +713,11 @@ bool YAPQuery::next()
CACHE_REGS CACHE_REGS
bool result = false; bool result = false;
Term terr; Term terr;
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "next %d %ld",
q_state, LOCAL_CurSlot);
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "next %d %s %ld",
q_state, names->text(), LOCAL_CurSlot);
if (ap == NULL || ap->OpcodeOfPred == UNDEF_OPCODE) { if (ap == NULL || ap->OpcodeOfPred == UNDEF_OPCODE) {
ap = rewriteUndefQuery(); ap = rewriteUndefQuery();
} }
@ -718,7 +727,7 @@ bool YAPQuery::next()
BACKUP_MACHINE_REGS(); BACKUP_MACHINE_REGS();
if (!q_open) if (!q_open)
return false; return false;
if (sigsetjmp(q_env, false)) if (false && sigsetjmp(q_env, false))
{ {
throw YAPError(); throw YAPError();
} }
@ -736,57 +745,57 @@ bool YAPQuery::next()
} }
if (result) if (result)
{ {
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "vnames %d %s %ld", __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "names %d %s %ld",
q_state, vnames.text(), LOCAL_CurSlot); q_state, names->text(), LOCAL_CurSlot);
} }
else else
{ {
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "fail"); __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "fail");
} }
q_state = 1; q_state = 1;
if ((terr = Yap_GetException())) if ((terr = Yap_GetException()))
{
if ((terr = Yap_GetException()))
{ {
throw YAPError(); if ((terr = Yap_GetException()))
{
throw YAPError();
}
} }
}
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "out %d", result); __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "out %d", result);
if (!result) if (!result)
{ {
YAP_LeaveGoal(false, &q_h); YAP_LeaveGoal(false, &q_h);
Yap_CloseHandles(q_handles); Yap_CloseHandles(q_handles);
q_open = false; q_open = false;
} }
else else
{ {
q_handles = Yap_StartSlots(); q_handles = Yap_StartSlots();
} }
RECOVER_MACHINE_REGS(); RECOVER_MACHINE_REGS();
return result; return result;
} }
catch (YAPError e) catch (YAPError e)
{ {
q_open = false; q_open = false;
Yap_PopTermFromDB(LOCAL_ActiveError->errorTerm); Yap_PopTermFromDB(LOCAL_ActiveError->errorTerm);
memset(LOCAL_ActiveError, 0, sizeof(*LOCAL_ActiveError)); memset(LOCAL_ActiveError, 0, sizeof(*LOCAL_ActiveError));
YAP_LeaveGoal(false, &q_h); YAP_LeaveGoal(false, &q_h);
Yap_CloseHandles(q_handles); Yap_CloseHandles(q_handles);
q_open = false; q_open = false;
std::cerr << "Exception received by " << __func__ << "( " << YAPTerm(terr).text() << ").\n Forwarded...\n\n"; std::cerr << "Exception received by " << __func__ << "( " << YAPTerm(terr).text() << ").\n Forwarded...\n\n";
throw e; throw e;
} }
} }
PredEntry * PredEntry *
YAPQuery::rewriteUndefQuery() YAPQuery::rewriteUndefQuery()
{ {
Term ts[3]; Term ts[3];
ARG1 = ts[0] = goal.term(); ARG1 = ts[0] = goal->term();
ARG2 = ts[1] = ap->ModuleOfPred; ARG2 = ts[1] = ap->ModuleOfPred;
ARG3 = ts[2] = Yap_cp_as_integer(B PASS_REGS); ARG3 = ts[2] = Yap_cp_as_integer(B PASS_REGS);
goal = YAPApplTerm(FunctorUndefinedQuery, ts); goal = new YAPApplTerm(FunctorUndefinedQuery, ts);
return ap = PredUndefinedQuery; return ap = PredUndefinedQuery;
} }
@ -868,39 +877,6 @@ JNIEXPORT jint JNICALL JNI_MySQLOnLoad(JavaVM *vm, void *reserved)
return JNI_VERSION_1_6; return JNI_VERSION_1_6;
} }
char *Yap_AndroidBufp;
static size_t Yap_AndroidMax, Yap_AndroidSz;
extern void (*Yap_DisplayWithJava)(int c);
void Yap_displayWithJava(int c)
{
char *ptr = Yap_AndroidBufp;
if (!ptr)
ptr = Yap_AndroidBufp = (char *)malloc(Yap_AndroidSz);
ptr[Yap_AndroidSz++] = c;
if (Yap_AndroidMax - 1 == Yap_AndroidSz)
{
if (Yap_AndroidMax < 32 * 1024)
{
Yap_AndroidMax *= 2;
}
else
{
Yap_AndroidMax += 32 * 1024;
}
Yap_AndroidBufp = (char *)realloc(ptr, Yap_AndroidMax);
}
Yap_AndroidBufp[Yap_AndroidSz] = '\0';
if (c == '\n')
{
Yap_AndroidBufp[Yap_AndroidSz] = '\0';
curren->run(Yap_AndroidBufp);
Yap_AndroidSz = 0;
}
}
#endif #endif
@ -913,22 +889,18 @@ void YAPEngine::doInit(YAP_file_type_t BootMode)
/* Begin preprocessor code */ /* Begin preprocessor code */
/* live */ /* live */
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "initialize_prolog"); __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "initialize_prolog");
#if __ANDROID__ curren = this;
Yap_AndroidBufp = (char *)malloc(Yap_AndroidMax = 4096);
Yap_AndroidBufp[0] = '\0';
Yap_AndroidSz = 0;
#endif
//yerror = YAPError(); //yerror = YAPError();
#if YAP_PYTHON #if YAP_PYTHON
do_init_python(); do_init_python();
#endif #endif
YAP_PredEntryPtr p = YAP_AtomToPred( YAP_LookupAtom("initialize_prolog") ); YAP_PredEntryPtr p = YAP_AtomToPred( YAP_LookupAtom("initialize_prolog") );
YAPQuery initq = YAPQuery(YAPPredicate(p), nullptr); YAPQuery initq = YAPQuery(YAPPredicate(p), nullptr);
if (initq.next()) if (initq.next())
{ {
initq.cut(); initq.cut();
} }
CurrentModule = TermUser; CurrentModule = TermUser;
} }

85
CXX/yapq.hh
View File

@ -41,8 +41,8 @@ class X_API YAPQuery : public YAPPredicate
int q_flags; int q_flags;
YAP_dogoalinfo q_h; YAP_dogoalinfo q_h;
YAPQuery *oq; YAPQuery *oq;
YAPPairTerm names; YAPPairTerm *names;
YAPTerm goal; YAPTerm *goal;
// temporaries // temporaries
Term tnames, tgoal ; Term tnames, tgoal ;
@ -55,6 +55,8 @@ class X_API YAPQuery : public YAPPredicate
q_p = P; q_p = P;
q_cp = CP; q_cp = CP;
// make sure this is safe // make sure this is safe
names = new YAPPairTerm();
goal = new YAPTerm();
q_handles = LOCAL_CurSlot; q_handles = LOCAL_CurSlot;
}; };
@ -97,8 +99,7 @@ YAPQuery() {
LOCAL_CurSlot); LOCAL_CurSlot);
if (!ap) if (!ap)
return; return;
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "%s", vnames.text()); __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "ŸAPQuery");
goal = YAPTerm(tgoal);
if (IsPairTerm(tgoal)) { if (IsPairTerm(tgoal)) {
qt = RepPair(tgoal); qt = RepPair(tgoal);
tgoal = Yap_MkApplTerm(Yap_MkFunctor(Yap_LookupAtom("consult"), 1),1,qt); tgoal = Yap_MkApplTerm(Yap_MkFunctor(Yap_LookupAtom("consult"), 1),1,qt);
@ -108,8 +109,11 @@ YAPQuery() {
qt = RepAppl(tgoal)+1; qt = RepAppl(tgoal)+1;
} }
} }
names = YAPPairTerm(tnames); names = new YAPPairTerm();
openQuery(tgoal, qt); goal = new YAPTerm(tgoal);
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "names %d %s %ld",
q_state, names->text(), LOCAL_CurSlot);
openQuery(tgoal, qt);
}; };
// inline YAPQuery() : YAPPredicate(s, tgoal, tnames) // inline YAPQuery() : YAPPredicate(s, tgoal, tnames)
// { // {
@ -117,7 +121,7 @@ YAPQuery() {
// LOCAL_CurSlot); // LOCAL_CurSlot);
// if (!ap) // if (!ap)
// return; // return;
// __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "%s", vnames.text()); // __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "%s", names->text());
// goal = YAPTerm(tgoal); // goal = YAPTerm(tgoal);
// names = YAPPairTerm(tnames); // names = YAPPairTerm(tnames);
// openQuery(tgoal); // openQuery(tgoal);
@ -130,40 +134,39 @@ YAPQuery() {
/// set flags for query execution, currently only for exception handling /// set flags for query execution, currently only for exception handling
void setFlag(int flag) { q_flags |= flag; } void setFlag(int flag) { q_flags |= flag; }
/// reset flags for query execution, currently only for exception handling /// reset flags for query execution, currently only for exception handling
void resetFlag(int flag) { q_flags &= ~flag; } void resetFlag(int flag) { q_flags &= ~flag; }
/// first query /// first query
/// ///
/// actually implemented by calling the next(); /// actually implemented by calling the next();
inline bool first() { return next(); } inline bool first() { return next(); }
/// ask for the next solution of the current query /// ask for the next solution of the current query
/// same call for every solution /// same call for every solution
bool next(); bool next();
/// does this query have open choice-points? /// does this query have open choice-points?
/// or is it deterministic? /// or is it deterministic?
bool deterministic(); bool deterministic();
/// represent the top-goal /// represent the top-goal
const char *text(); const char *text();
/// remove alternatives in the current search space, and finish the current /// remove alternatives in the current search space, and finish tnamedyaphe current
/// query /// query
/// finish the current query: undo all bindings. /// finish the current query: undo all bindings.
void close(); void close();
/// query variables. /// query variables.
void cut(); void cut();
Term namedVars() {return names.term(); };
/// query variables, but copied out Term namedVars() {return names->term(); };
std::vector<Term> namedVarsVector() { YAPPairTerm * namedYAPVars() {return names; };
return names.listToArray(); }; /// query variables, but copied out
/// convert a ref to a binding. YAPTerm getTerm(yhandle_t t);
YAPTerm getTerm(yhandle_t t); /// simple YAP Query;
/// simple YAP Query; /// just calls YAP and reports success or failure, Useful when we just
/// just calls YAP and reports success or failure, Useful when we just /// want things done, eg YAPCommand("load_files(library(lists), )")
/// want things done, eg YAPCommand("load_files(library(lists), )") inline bool command()
inline bool command() {
{ bool rc = next();
bool rc = next(); close();
close(); return rc;
return rc; };
};
}; };
// Java support // Java support

869
CXX/yapt.hh
View File

File diff suppressed because it is too large Load Diff

8
H/YapHandles.h
View File

@ -179,15 +179,15 @@ INLINE_ONLY inline EXTERN void Yap_PutInHandle__(yhandle_t slot,
LOCAL_HandleBase[slot] = t; LOCAL_HandleBase[slot] = t;
} }
#ifndef max #ifndef Yap_Max
#define max(X, Y) (X > Y ? X : Y) #define Yap_Max(X, Y) (X > Y ? X : Y)
#endif #endif
#define ensure_handles ensure_slots #define ensure_handles ensure_slots
INLINE_ONLY inline EXTERN void ensure_slots(int N USES_REGS) { INLINE_ONLY inline EXTERN void ensure_slots(int N USES_REGS) {
if (LOCAL_CurHandle + N >= LOCAL_NHandles) { if (LOCAL_CurHandle + N >= LOCAL_NHandles) {
size_t inc = max(16 * 1024, LOCAL_NHandles / 2); // measured in cells size_t inc = Yap_Max(16 * 1024, LOCAL_NHandles / 2); // measured in cells
inc = max(inc, (size_t)N + 16); // measured in cells inc = Yap_Max(inc, (size_t)N + 16); // measured in cells
LOCAL_HandleBase = (CELL *)realloc(LOCAL_HandleBase, LOCAL_HandleBase = (CELL *)realloc(LOCAL_HandleBase,
(inc + LOCAL_NHandles) * sizeof(CELL)); (inc + LOCAL_NHandles) * sizeof(CELL));
LOCAL_NHandles += inc; LOCAL_NHandles += inc;

5
H/YapText.h
View File

@ -59,8 +59,9 @@ extern int pop_text_stack(int lvl USES_REGS);
extern void *protected_pop_text_stack(int lvl, void *safe, bool tmp, extern void *protected_pop_text_stack(int lvl, void *safe, bool tmp,
size_t sz USES_REGS); size_t sz USES_REGS);
#ifndef min #ifndef Yap_Min
#define min(x, y) (x < y ? x : y) #define Yap_Min(x, y) (x < y ? x : y)
#endif #endif
#define MBYTE (1024 * 1024) #define MBYTE (1024 * 1024)

5
cmake/FindGMP.cmake
View File

@ -8,6 +8,8 @@
# GMP_LIBRARY_DLL - library DLL to install. Only available on WIN32. # GMP_LIBRARY_DLL - library DLL to install. Only available on WIN32.
# GMP_LIBRARIES_DIR - the directory the library we link with is found in. # GMP_LIBRARIES_DIR - the directory the library we link with is found in.
message( "xxxxx ${ANDROID_ABI} yyyyy ${CMAKE_CURRENT_DIR} zzzzzzzzzz" )
if (ANDROID) if (ANDROID)
set( GMP_ROOT ${CMAKE_SOURCE_DIR}/../gmp/${ANDROID_ABI} ) set( GMP_ROOT ${CMAKE_SOURCE_DIR}/../gmp/${ANDROID_ABI} )
set (GMP_FOUND ON) set (GMP_FOUND ON)
@ -26,7 +28,8 @@ if(MSVC)
${CMAKE_SOURCE_DIR}/../tools/mpird/lib ${CMAKE_SOURCE_DIR}/../tools/mpird/lib
${CMAKE_SOURCE_DIR}/../mpir/lib ${CMAKE_SOURCE_DIR}/../mpir/lib
${CMAKE_SOURCE_DIR}/../mpird/lib ${CMAKE_SOURCE_DIR}/../mpird/lib
$ENV{PROGRAMFILES}/mpir/lib
$ENV{PROGRAMFILES}/mpir/lib
$ENV{PROGRAMFILES}/mpird/lib $ENV{PROGRAMFILES}/mpird/lib
$ENV{HOME}/mpir/lib $ENV{HOME}/mpir/lib
$ENV{HOME}/mpird/lib $ENV{HOME}/mpird/lib

14
cmake/Prelims.cmake
View File

@ -7,7 +7,7 @@ if (POLICY CMP0042)
cmake_policy( SET CMP0042 NEW) cmake_policy( SET CMP0042 NEW)
endif() endif()
if (ANDROID) if (ANDROID_OLD)
macro ( MY_add_custom_target) macro ( MY_add_custom_target)
endmacro() endmacro()
else() else()
@ -17,7 +17,7 @@ else()
endif() endif()
if (ANDROID) if (ANDROID_OLD)
macro ( add_component arg1) macro ( add_component arg1)
foreach(item ${ARGN}) foreach(item ${ARGN})
get_filename_component(i ${item} ABSOLUTE) get_filename_component(i ${item} ABSOLUTE)
@ -41,7 +41,7 @@ else()
endmacro() endmacro()
endif() endif()
if (ANDROID) if (ANDROID_OLD)
macro ( MY_add_dependencies) macro ( MY_add_dependencies)
endmacro() endmacro()
else() else()
@ -50,7 +50,7 @@ else()
endmacro() endmacro()
endif() endif()
if (ANDROID) if (ANDROID_OLD)
macro ( MY_add_library) macro ( MY_add_library)
endmacro() endmacro()
else() else()
@ -68,7 +68,7 @@ else()
endmacro() endmacro()
endif() endif()
if (ANDROID) if (ANDROID_OLD)
macro ( MY_include) macro ( MY_include)
endmacro() endmacro()
else() else()
@ -86,7 +86,7 @@ else()
endmacro() endmacro()
endif() endif()
if (ANDROID) if (ANDROID_OLD)
macro ( MY_set_target_properties) macro ( MY_set_target_properties)
endmacro() endmacro()
else() else()
@ -95,7 +95,7 @@ else()
endmacro() endmacro()
endif() endif()
if (ANDROID) if (ANDROID_OLD)
macro ( MY_target_link_libraries) macro ( MY_target_link_libraries)
endmacro() endmacro()
else() else()

0
console/terminal/main.cpp → console/terminal/streamer.cpp
View File

9
include/VFS.h
View File

@ -31,6 +31,8 @@
#endif #endif
#endif #endif
#include <encoding.h>
typedef struct { typedef struct {
dev_t st_dev; /* ID of device containing file */ dev_t st_dev; /* ID of device containing file */
mode_t st_mode; /* Mode of file (see below) */ mode_t st_mode; /* Mode of file (see below) */
@ -47,6 +49,7 @@ typedef struct {
#endif #endif
} vfs_stat; } vfs_stat;
typedef enum vfs_flags { typedef enum vfs_flags {
VFS_CAN_WRITE = 0x1, /// we can write to files in this space VFS_CAN_WRITE = 0x1, /// we can write to files in this space
VFS_CAN_EXEC = 0x2, /// we can execute files in this space VFS_CAN_EXEC = 0x2, /// we can execute files in this space
@ -62,7 +65,7 @@ typedef union {
size_t sz; size_t sz;
void *pt; void *pt;
uintptr_t scalar; uintptr_t scalar;
#if __ANDROID__ #if __ANDROID__0
AAssetManager *mgr; AAssetManager *mgr;
AAsset *asset; AAsset *asset;
#endif #endif
@ -108,6 +111,10 @@ typedef struct vfs {
extern VFS_t *GLOBAL_VFS; extern VFS_t *GLOBAL_VFS;
extern void init_android_stream(void);
extern void Yap_InitStdStream(int sno, SMALLUNSGN flags, FILE *file, VFS_t *vfsp);
static inline VFS_t *vfs_owner(const char *fname) { static inline VFS_t *vfs_owner(const char *fname) {
VFS_t *me = GLOBAL_VFS; VFS_t *me = GLOBAL_VFS;
int d; int d;

12
libYap.cmake
View File

@ -92,12 +92,12 @@ list(APPEND YAP_SYSTEM_OPTIONS "thread support")
# we use the nice UTF-8 package # we use the nice UTF-8 package
#available at the Julia project #available at the Julia project
MY_ADD_SUBDIRECTORY ( os ) ADD_SUBDIRECTORY ( os )
MY_ADD_SUBDIRECTORY ( OPTYap ) ADD_SUBDIRECTORY ( OPTYap )
MY_ADD_SUBDIRECTORY ( packages/myddas ) ADD_SUBDIRECTORY ( packages/myddas )
MY_ADD_SUBDIRECTORY ( utf8proc ) ADD_SUBDIRECTORY ( utf8proc )
MY_ADD_SUBDIRECTORY ( library/dialect/swi/fli ) ADD_SUBDIRECTORY ( library/dialect/swi/fli )
MY_ADD_SUBDIRECTORY ( CXX ) ADD_SUBDIRECTORY ( CXX )
if (READLINE_LIBS) if (READLINE_LIBS)
target_link_libraries(libYap ${READLINE_LIBS} ) target_link_libraries(libYap ${READLINE_LIBS} )

4
os/assets.c
View File

@ -33,7 +33,7 @@ static char SccsId[] = "%W% %G%";
// for native asset manager // for native asset manager
#include <sys/types.h> #include <sys/types.h>
#if __ANDROID__ #if __ANDROID__0
static AAssetManager * getMgr(struct vfs *me) static AAssetManager * getMgr(struct vfs *me)
@ -212,7 +212,7 @@ VFS_t *
Yap_InitAssetManager(void) Yap_InitAssetManager(void)
{ {
#if __ANDROID__ #if __ANDROID__O
VFS_t *me; VFS_t *me;
/* init standard VFS */ /* init standard VFS */
me = (VFS_t *)Yap_AllocCodeSpace(sizeof(struct vfs)); me = (VFS_t *)Yap_AllocCodeSpace(sizeof(struct vfs));

20
os/iopreds.c
View File

@ -285,7 +285,7 @@ static void InitFileIO(StreamDesc *s) {
Yap_DefaultStreamOps(s); Yap_DefaultStreamOps(s);
} }
static void InitStdStream(int sno, SMALLUNSGN flags, FILE *file, void *vfsp) { static void InitStdStream(int sno, SMALLUNSGN flags, FILE *file, VFS_t *vfsp) {
StreamDesc *s = &GLOBAL_Stream[sno]; StreamDesc *s = &GLOBAL_Stream[sno];
s->file = file; s->file = file;
s->status = flags; s->status = flags;
@ -295,7 +295,15 @@ static void InitStdStream(int sno, SMALLUNSGN flags, FILE *file, void *vfsp) {
s->vfs = vfsp; s->vfs = vfsp;
s->encoding = ENC_ISO_UTF8; s->encoding = ENC_ISO_UTF8;
INIT_LOCK(s->streamlock); INIT_LOCK(s->streamlock);
if (vfsp != NULL) {
s->u.private_data = vfsp->open(vfsp->name, (sno == StdInStream ? "read" : "write" ));
if (s->u.private_data == NULL) {
(PlIOError(EXISTENCE_ERROR_SOURCE_SINK, MkIntTerm(sno), "%s", vfsp->name));
return;
}
} else {
unix_upd_stream_info(s); unix_upd_stream_info(s);
}
/* Getting streams to prompt is a mess because we need for cooperation /* Getting streams to prompt is a mess because we need for cooperation
between readers and writers to the stream :-( between readers and writers to the stream :-(
*/ */
@ -326,6 +334,11 @@ static void InitStdStream(int sno, SMALLUNSGN flags, FILE *file, void *vfsp) {
#endif /* HAVE_SETBUF */ #endif /* HAVE_SETBUF */
} }
void Yap_InitStdStream(int sno, SMALLUNSGN flags, FILE *file, VFS_t *vfsp) {
InitStdStream(sno, flags, file, vfsp);
}
Term Yap_StreamUserName(int sno) { Term Yap_StreamUserName(int sno) {
Term atname; Term atname;
StreamDesc *s = &GLOBAL_Stream[sno]; StreamDesc *s = &GLOBAL_Stream[sno];
@ -341,13 +354,13 @@ static void InitStdStreams(void) {
CACHE_REGS CACHE_REGS
if (LOCAL_sockets_io) { if (LOCAL_sockets_io) {
InitStdStream(StdInStream, Input_Stream_f, NULL, NULL); InitStdStream(StdInStream, Input_Stream_f, NULL, NULL);
InitStdStream(StdOutStream, Output_Stream_f, NULL, NULL); InitStdStream(StdOutStream, Output_Stream_f, NULL, NULL);
InitStdStream(StdErrStream, Output_Stream_f, NULL, NULL); InitStdStream(StdErrStream, Output_Stream_f, NULL, NULL);
} else { } else {
InitStdStream(StdInStream, Input_Stream_f, stdin, NULL); InitStdStream(StdInStream, Input_Stream_f, stdin, NULL);
InitStdStream(StdOutStream, Output_Stream_f, stdout, NULL); InitStdStream(StdOutStream, Output_Stream_f, stdout, NULL);
InitStdStream(StdErrStream, Output_Stream_f, stderr, NULL); InitStdStream(StdErrStream, Output_Stream_f, stderr, NULL);
} }
GLOBAL_Stream[StdInStream].name = Yap_LookupAtom("user_input"); GLOBAL_Stream[StdInStream].name = Yap_LookupAtom("user_input");
GLOBAL_Stream[StdOutStream].name = Yap_LookupAtom("user_output"); GLOBAL_Stream[StdOutStream].name = Yap_LookupAtom("user_output");
GLOBAL_Stream[StdErrStream].name = Yap_LookupAtom("user_error"); GLOBAL_Stream[StdErrStream].name = Yap_LookupAtom("user_error");
@ -1070,6 +1083,7 @@ bool Yap_initStream(int sno, FILE *fd, const char *name, Term file_name,
st->encoding = encoding; st->encoding = encoding;
} }
if (name == NULL) { if (name == NULL) {
char buf[YAP_FILENAME_MAX + 1]; char buf[YAP_FILENAME_MAX + 1];
name = Yap_guessFileName(fd, sno, buf, YAP_FILENAME_MAX); name = Yap_guessFileName(fd, sno, buf, YAP_FILENAME_MAX);

2
os/streams.c
View File

@ -281,7 +281,7 @@ has_reposition(int sno,
} }
char *Yap_guessFileName(FILE *file, int sno, char *nameb, size_t max) { char *Yap_guessFileName(FILE *file, int sno, char *nameb, size_t max) {
size_t maxs = max(255, max); size_t maxs = Yap_Max(255, max);
if (!nameb) { if (!nameb) {
nameb = malloc(maxs + 1); nameb = malloc(maxs + 1);
} }

4
packages/myddas/myddas_shared.c
View File

@ -685,7 +685,7 @@ void init_myddas(void) {
#if defined MYDDAS_ODBC #if defined MYDDAS_ODBC
Yap_InitBackMYDDAS_ODBCPreds(); Yap_InitBackMYDDAS_ODBCPreds();
#endif #endif
#if defined MYDDAS_SQLITE3 #if WIN32
Yap_InitBackMYDDAS_SQLITE3Preds(); Yap_InitBackMYDDAS_SQLITE3Preds();
#endif #endif
#if defined USE_MYDDAS #if defined USE_MYDDAS
@ -697,7 +697,7 @@ void init_myddas(void) {
#if defined MYDDAS_ODBC #if defined MYDDAS_ODBC
Yap_InitMYDDAS_ODBCPreds(); Yap_InitMYDDAS_ODBCPreds();
#endif #endif
#if defined MYDDAS_SQLITE3 #if WIN32
Yap_InitMYDDAS_SQLITE3Preds(); Yap_InitMYDDAS_SQLITE3Preds();
#endif #endif
#if defined USE_MYDDAS #if defined USE_MYDDAS

11
packages/myddas/pl/CMakeLists.txt
View File

@ -39,11 +39,17 @@ function(cpp_compile output filename)
set_source_files_properties(${outfile} PROPERTIES GENERATED TRUE) set_source_files_properties(${outfile} PROPERTIES GENERATED TRUE)
endfunction() endfunction()
if (ANDROID)
set (MYDDAS_PL_OUTDIR ${YAP_APP_DIR}/src/generated/assets/Yap} )
else()
set (MYDDAS_PL_OUTDIR ${CMAKE_CURRENT_BINARY_DIR} )
endif()
function(cpp_driver output dbms filename) function(cpp_driver output dbms filename)
if (0) if (0)
set(outfile ${libpl}/myddas_${dbms}.yap) set(outfile ${MYDDAS_PL_OUTDIR}/myddas_${dbms}.yap)
else() else()
set(outfile ${CMAKE_CURRENT_BINARY_DIR}/myddas_${dbms}.yap) set(outfile ${MYDDAS_PL_OUTDIR}/myddas_${dbms}.yap)
endif() endif()
set(${output} ${${output}} ${outfile} PARENT_SCOPE) set(${output} ${${output}} ${outfile} PARENT_SCOPE)
IF (MSVC) IF (MSVC)
@ -74,3 +80,4 @@ add_custom_target(plmyddas ALL DEPENDS ${MYDDAS_YAP} )
install(FILES ${MYDDAS_YAP} install(FILES ${MYDDAS_YAP}
DESTINATION ${libpl} DESTINATION ${libpl}
) )

10
packages/myddas/sqlite3/CMakeLists.txt
View File

@ -40,14 +40,14 @@ src/Android/jni/sqlite/android_database_SQLiteConnection.cpp
src/Android/jni/sqlite/android_database_SQLiteDebug.cpp src/Android/jni/sqlite/android_database_SQLiteDebug.cpp
src/Android/jni/sqlite/android_database_SQLiteGlobal.cpp src/Android/jni/sqlite/android_database_SQLiteGlobal.cpp
src/Android/jni/sqlite/nativehelper/jni.h src/Android/jni/sqlite/nativehelper/jni.h
src/Android/jni/sqlite/nativehelper/jniConstants.h src/Android/jni/sqlite/nativehelper/JniConstants.h
src/Android/jni/sqlite/nativehelper/JNIHelp.h src/Android/jni/sqlite/nativehelper/JNIHelp.h
src/Android/jni/sqlite/nativehelper/ScopedLocalRef.h src/Android/jni/sqlite/nativehelper/ScopedLocalRef.h
) )
endif (ANDROID) endif (ANDROID)
add_component( Yapsqlite3 add_library( Yapsqlite3 SHARED
${YAPSQLITE3_SOURCES} ) ${YAPSQLITE3_SOURCES} )
MY_set_target_properties(Yapsqlite3 MY_set_target_properties(Yapsqlite3
@ -56,3 +56,9 @@ add_component( Yapsqlite3
# SOVERSION ${LIBYAPTAI_MAJOR_VERSION}.${LIBYAPTAI_MINOR_VERSION} # SOVERSION ${LIBYAPTAI_MAJOR_VERSION}.${LIBYAPTAI_MINOR_VERSION}
POSITION_INDEPENDENT_CODE TRUE POSITION_INDEPENDENT_CODE TRUE
) )
if (ANDROID)
target_link_libraries(Yapsqlite3 android log)
endif ()

11
packages/myddas/sqlite3/myddas_sqlite3.c
View File

@ -658,6 +658,17 @@ void init_sqlite3( void )
Yap_InitBackMYDDAS_SQLITE3Preds(); Yap_InitBackMYDDAS_SQLITE3Preds();
} }
#if _ANDROID_
JNIEXPORT void JNICALL
lib_yap_up_pt_init_sqlite(JNIEnv *env);
JNIEXPORT void JNICALL
lib_yap_up_pt_init_sqlite(JNIEnv *env)
{
init_sqlite3();
}
#endif
#ifdef _WIN32 #ifdef _WIN32

7
packages/myddas/sqlite3/src/Android/jni/sqlite/android_database_SQLiteConnection.cpp
View File

@ -360,23 +360,22 @@ static jlong nativePrepareStatement(JNIEnv *env, jclass clazz,
int err = sqlite3_prepare16_v2(connection->db, sql, sqlLength * sizeof(jchar), int err = sqlite3_prepare16_v2(connection->db, sql, sqlLength * sizeof(jchar),
&statement, NULL); &statement, NULL);
env->ReleaseStringCritical(sqlString, sql); env->ReleaseStringCritical(sqlString, sql);
#if 0
if (err != SQLITE_OK) { if (err != SQLITE_OK) {
// Error messages like 'near ")": syntax error' are not // Error messages like 'near ")": syntax error' are not
// always helpful enough, so construct an error string that // always helpful enough, so construct an error string that
// includes the query itself. // includes the query itself.
const char *query = env->GetStringUTFChars(sqlString, NULL); const char *query = env->GetStringUTFChars(sqlString, NULL);
char *message = (char *)malloc(strlen(query) + 50); char *message[512];
if (message) { if (message) {
strcpy(message, ", while compiling: "); // less than 50 chars strcpy(message, ", while compiling: "); // less than 50 chars
strcat(message, query); strcat(message, query);
} }
env->ReleaseStringUTFChars(sqlString, query); env->ReleaseStringUTFChars(sqlString, query);
throw_sqlite3_exception(env, connection->db, message); throw_sqlite3_exception(env, connection->db, message);
free(message);
return 0; return 0;
} }
#endif
ALOGV("Prepared statement %p on connection %p", statement, connection->db); ALOGV("Prepared statement %p on connection %p", statement, connection->db);
return reinterpret_cast<jlong>(statement); return reinterpret_cast<jlong>(statement);
} }

4
packages/python/CMakeLists.txt
View File

@ -14,6 +14,8 @@ add_library (YAPPython SHARED pyload.c ${PYTHON_HEADERS} )
if (WIN32) if (WIN32)
add_library (Py4YAP OBJECT ${PYTHON_SOURCES} ${PYTHON_HEADERS}) add_library (Py4YAP OBJECT ${PYTHON_SOURCES} ${PYTHON_HEADERS})
target_link_libraries(YAPPython libYap ${PYTHON_LIBRARIES})
else() else()
add_library (Py4YAP SHARED ${PYTHON_SOURCES} ${PYTHON_HEADERS}) add_library (Py4YAP SHARED ${PYTHON_SOURCES} ${PYTHON_HEADERS})
@ -21,7 +23,6 @@ add_library (Py4YAP SHARED ${PYTHON_SOURCES} ${PYTHON_HEADERS})
set_property(TARGET Py4YAP PROPERTY CXX_STANDARD_REQUIRED ON) set_property(TARGET Py4YAP PROPERTY CXX_STANDARD_REQUIRED ON)
target_link_libraries(Py4YAP libYap ${PYTHON_LIBRARIES}) target_link_libraries(Py4YAP libYap ${PYTHON_LIBRARIES})
target_link_libraries(YAPPython Py4YAP)
MY_install(TARGETS Py4YAP MY_install(TARGETS Py4YAP
LIBRARY DESTINATION ${libdir} LIBRARY DESTINATION ${libdir}
@ -33,7 +34,6 @@ endif()
# arithmetic hassle. # arithmetic hassle.
set_property(TARGET YAPPython PROPERTY CXX_STANDARD_REQUIRED ON) set_property(TARGET YAPPython PROPERTY CXX_STANDARD_REQUIRED ON)
target_link_libraries(YAPPython libYap ${PYTHON_LIBRARIES})
set_property( SOURCE ${PYTHON_SOURCES} APPEND PROPERTY COMPILE_DEFINITIONS YAP_KERNEL=1 _GNU_SOURCE=1) set_property( SOURCE ${PYTHON_SOURCES} APPEND PROPERTY COMPILE_DEFINITIONS YAP_KERNEL=1 _GNU_SOURCE=1)

7
packages/python/swig/__init__.py
View File

@ -20,6 +20,7 @@ else:
dll = glob.glob(os.path.join(yap_lib_path,dll))[0] dll = glob.glob(os.path.join(yap_lib_path,dll))[0]
dll = os.path.abspath(dll) dll = os.path.abspath(dll)
ctypes.CDLL(dll, mode=ctypes.RTLD_GLOBAL) ctypes.CDLL(dll, mode=ctypes.RTLD_GLOBAL)
load('libYap*') if platform.system() == 'Apple'::
load('libYAP+*') load('libYap*')
load('libPy4YAP*') load('libYAP+*')
load('libPy4YAP*')

4
packages/swig/CMakeLists.txt
View File

@ -8,12 +8,14 @@
# This is a CMake example for Python and Java # This is a CMake example for Python and Java
set (SOURCES yap.i)
INCLUDE(${SWIG_USE_FILE}) INCLUDE(${SWIG_USE_FILE})
if (ANDROID) if (ANDROID)
add_subdirectory(android) add_subdirectory(android)
else(ANDROID) else(ANDROID)
# add_subdirectory(java) add_subdirectory(java)
endif(ANDROID) endif(ANDROID)
set_property( DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS SWIGYAP=1) set_property( DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS SWIGYAP=1)

69
packages/swig/android/CMakeLists.txt
View File

@ -1,21 +1,72 @@
# This is a CMake example for Python and Java # This is a CMake file for SWIG and Android
FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/generated/java/pt/up/yap/lib )
FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/generated/assets)
set(CMAKE_SWIG_OUTDIR ${YAP_APP_DIR}/src/generated/java/pt/up/yap/lib )
set( SWIG_MODULE_NAME pt.up.yap.lib )
set ( pllib ${YAP_APP_DIR}/src/generated/assets/Yap )
set(CMAKE_SWIG_OUTDIR ${YAP_APP_DIR}/app/src/main/java/pt/up/yap/lib ) set ( SWIG_SOURCES ${CMAKE_SOURCE_DIR}/packages/swig/yap.i )
set ( SWIG_SOURCES ../yap.i )
SET_SOURCE_FILES_PROPERTIES(${SWIG_SOURCES} PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(${SWIG_SOURCES} PROPERTIES CPLUSPLUS ON)
include_directories ( include_directories (
${CMAKE_SOURCE_DIR}/CXX ${CMAKE_SOURCE_DIR}/CXX
) )
set( GMP_ROOT ${CMAKE_SOURCE_DIR}/../gmp/${ANDROID_ABI} )
set (GMP_INCLUDE_DIRS ${GMP_ROOT})
set (GMP_LIBRARIES ${GMP_ROOT}/libgmp.so)
add_custom_command (OUTPUT yap_swig.cpp add_custom_command (OUTPUT yap_swig.cpp
COMMAND ${SWIG} -java -outdir ${CMAKE_SWIG_OUTDIR} -outcurrentdir -addextern -I${CMAKE_SOURCE_DIR}/CXX ${SWIG_SOURCES} -o yap_swig.cpp COMMAND ${CMAKE_COMMAND} -E make_directory ${pllib}
) COMMAND ${CMAKE_COMMAND} -E make_directory ${pllib}/pl
COMMAND ${CMAKE_COMMAND} -E make_directory ${pllib}/os
add_custom_target ( swig ALL COMMAND ${CMAKE_COMMAND} -E copy ${pl_library} ${pllib}
DEPENDS yap_swig.cpp COMMAND ${CMAKE_COMMAND} -E copy ${pl_boot_library} ${pllib}/pl
) COMMAND ${CMAKE_COMMAND} -E copy ${pl_os_library} ${pllib}/os
COMMAND ${SWIG_EXECUTABLE} -c++ -java -package ${SWIG_MODULE_NAME} -outdir ${CMAKE_SWIG_OUTDIR} -outcurrentdir -addextern -I${CMAKE_SOURCE_DIR}/CXX -I${CMAKE_SOURCE_DIR}/include -I${CMAKE_SOURCE_DIR}/H -I${CMAKE_SOURCE_DIR}/os -I${CMAKE_SOURCE_DIR}/OPTYap -I${CMAKE_BINARY_DIR} -I${GMP_INCLUDE_DIRS} -DX_API="" -o yap_swig.cpp ${SWIG_SOURCES}
DEPENDS ${SWIG_SOURCES} YAP++
)
add_custom_command (OUTPUT swig_streamer.cpp
COMMAND ${SWIG_EXECUTABLE} -c++ -java -package ${SWIG_MODULE_NAME} -outdir ${CMAKE_SWIG_OUTDIR} -outcurrentdir -addextern -I${CMAKE_CURRENT_SOURCE_DIR} -o swig_streamer.cpp streamer.i
DEPENDS streamer.i
)
# GMP_FOUND - true if GMP/MPIR was found
# GMP_INCLUDE_DIRS - include search path
# GMP_LIBRARIES - libraries to link with
#config.h needs this (TODO: change in code latter)
include_directories( .;${GMP_INCLUDE_DIRS};${CMAKE_SOURCE_DIR}/include;${CMAKE_SOURCE_DIR}/H;${CMAKE_SOURCE_DIR}/H/generated;${CMAKE_SOURCE_DIR}/os;${CMAKE_SOURCE_DIR}/OPTYap;${CMAKE_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR} )
add_library (YAPJava SHARED
yap_swig.cpp swig_streamer.cpp streamer.cpp streamer.h
)
target_link_libraries(YAPJava ${GMP_LIBRARIES} )
target_link_libraries( YAPJava YAP++ libYap android log)
if (FALSE)
set (SWIG_ADD_MODULE YAPJava SHARED CPLUPLUS ${SWIG_SOURCES} )
# Define swig module with given name and specified language
set (SWIG_LINK_LIBRARIES YAPJava YAP++ libYAP )
#- Link libraries to swig module
add_library (YAPJavaTop SHARED
main.cpp main.h
)
target_link_libraries( YAPJavaTop ${SWIG_MODULE_${YAPJava}_REAL_NAME} YAP++ libYap android)
endif()

5
packages/swig/java/JavaYAP.java
View File

@ -92,7 +92,10 @@ class JavaYAP {
public static void main(String args[]) public static void main(String args[])
{ {
System.loadLibrary("Native"); System.loadLibrary("gmp");
System.loadLibrary("Yap");
System.loadLibrary("YAP++");
System.loadLibrary("JAVAYap");
JavaYAP y = new JavaYAP(); JavaYAP y = new JavaYAP();

196
packages/swig/yap.i
View File

@ -1,10 +1,11 @@
// supports Java and Python
%{ %{
#include <cmath> #include <cmath>
#include <gmpxx.h> #include <gmpxx.h>
extern "C"{ extern "C"{
#ifdef SWIGPYTHON #ifdef SWIGPYTHON
#include <Python.h> #include <Python.h>
@ -22,11 +23,7 @@
%include std_string.i %include std_string.i
%include std_vector.i %include std_vector.i
namespace std {
%template(vectort) vector<Term>;
};
%feature("novaluewrapper") std::vector<Term>;
%ignore *::operator[]; %ignore *::operator[];
@ -255,148 +252,87 @@ case DOMAIN_ERROR_NOT_LESS_THAN_ZERO:
#else #else
// Language independent exception handler %typemap(in) arity_t { (jlong)($input); }
%include exception.i
%exception { %typecheck(2) Int { $1 = PyLong_Check($input); }
try { %typecheck(3) double { $1 = PyFloat_Check($input); }
$action %typecheck(2) const char * { $1 = PyUnicode_Check($input); }
} catch (YAPError e) {
yap_error_number en = e.getID(); %typecheck(1) Term { $1 = !PyUnicode_Check($input); }
LOCAL_Error_TYPE = YAP_NO_ERROR; %typecheck(1) YAP_Term { $1 = PyUnicode_Check($input); }
switch (e.getErrorClass()) {
case YAPC_NO_ERROR: %typecheck(0) YAPTerm { $1 = !PyUnicode_Check($input); }
break;
/// bad domain, "first argument often is the predicate.
case DOMAIN_ERROR: { %typemap(in) jlong %{
switch (en) { $1 = (jlong)$input;
case DOMAIN_ERROR_OUT_OF_RANGE: %}
case DOMAIN_ERROR_NOT_LESS_THAN_ZERO:
SWIG_exception(SWIG_IndexError, e.text()); %typemap(out) arity_t { *(jlong *)&$result = $1; }
break;
case DOMAIN_ERROR_CLOSE_OPTION: // Language independent exception handler
case DOMAIN_ERROR_ENCODING: // simplified version
case DOMAIN_ERROR_PROLOG_FLAG: %include <exception.i>
case DOMAIN_ERROR_ABSOLUTE_FILE_NAME_OPTION:
case DOMAIN_ERROR_READ_OPTION: %exception {
case DOMAIN_ERROR_SET_STREAM_OPTION: try {
SWIG_exception(SWIG_AttributeError, e.text()); $action
break; } catch (const std::out_of_range& e) {
case DOMAIN_ERROR_FILE_ERRORS: SWIG_exception(SWIG_IndexError, e.what());
case DOMAIN_ERROR_FILE_TYPE: } catch (const std::exception& e) {
case DOMAIN_ERROR_IO_MODE: SWIG_exception(SWIG_RuntimeError, e.what());
case DOMAIN_ERROR_SOURCE_SINK: } catch (...) {
case DOMAIN_ERROR_STREAM_POSITION: SWIG_exception(SWIG_RuntimeError, "unknown exception");
SWIG_exception(SWIG_IOError, e.text());
break;
default:
SWIG_exception(SWIG_ValueError, e.text());
}
} break;
/// bad arithmetic
case EVALUATION_ERROR: {
switch (en) {
case EVALUATION_ERROR_FLOAT_OVERFLOW:
case EVALUATION_ERROR_FLOAT_UNDERFLOW:
case EVALUATION_ERROR_INT_OVERFLOW:
case EVALUATION_ERROR_UNDERFLOW:
SWIG_exception(SWIG_OverflowError, e.text());
break;
case EVALUATION_ERROR_ZERO_DIVISOR:
SWIG_exception(SWIG_DivisionByZero, e.text());
break;
default:
SWIG_exception(SWIG_RuntimeError, e.text());
}
} break;
/// missing object (I/O mostly)
case EXISTENCE_ERROR:
SWIG_exception(SWIG_RuntimeError, e.text());
break;
/// should be bound
case INSTANTIATION_ERROR_CLASS:
SWIG_exception(SWIG_RuntimeError, e.text());
break;
/// bad access, I/O
case PERMISSION_ERROR: {
switch (en) {
case PERMISSION_ERROR_INPUT_BINARY_STREAM:
case PERMISSION_ERROR_INPUT_PAST_END_OF_STREAM:
case PERMISSION_ERROR_INPUT_STREAM:
case PERMISSION_ERROR_INPUT_TEXT_STREAM:
case PERMISSION_ERROR_OPEN_SOURCE_SINK:
case PERMISSION_ERROR_OUTPUT_BINARY_STREAM:
case PERMISSION_ERROR_REPOSITION_STREAM:
case PERMISSION_ERROR_OUTPUT_STREAM:
case PERMISSION_ERROR_OUTPUT_TEXT_STREAM:
SWIG_exception(SWIG_OverflowError, e.text());
break;
default:
SWIG_exception(SWIG_RuntimeError, e.text());
}
} break;
/// something that could not be represented into a type
case REPRESENTATION_ERROR:
SWIG_exception(SWIG_RuntimeError, e.text());
break;
/// not enough ....
case RESOURCE_ERROR:
SWIG_exception(SWIG_RuntimeError, e.text());
break;
/// bad text
case SYNTAX_ERROR_CLASS:
SWIG_exception(SWIG_SyntaxError, e.text());
break;
/// OS or internal
case SYSTEM_ERROR_CLASS:
SWIG_exception(SWIG_RuntimeError, e.text());
break;
/// bad typing
case TYPE_ERROR:
SWIG_exception(SWIG_TypeError, e.text());
break;
/// should be unbound
case UNINSTANTIATION_ERROR_CLASS:
SWIG_exception(SWIG_RuntimeError, e.text());
break;
/// escape hatch
default:
break;
}
}
} }
}
#endif #endif
%{ %{
/* Put header files here or function declarations like below */ /* Put header files here or function declarations like below */
extern "C" { extern "C" {
#if THREADS #if THREADS
#define Yap_regp regcache #define Yap_regp regcache
#endif #endif
// we cannot consult YapInterface.h, that conflicts with what we // we cannot consult YapInterface.h, that conflicts with what we
// declare, though // declare, though
// it shouldn't // it shouldn't
} }
%} extern void init_sqlite();
/* turn on director wrapping Callback */ %}
%feature("director") YAPCallback;
%include "yapa.hh"
%include "yapie.hh" /* turn on director wrapping Callback */
//%feature("director") YAPCallback;
%include "yapt.hh" %include "yapa.hh"
%include "yapdb.hh" %include "yapie.hh"
%include "yapq.hh" %include "yapt.hh"
%init %{ %include "yapdb.hh"
%}
%include "yapq.hh"
namespace std {
%template(TermVector) vector<Term>;
%feature("novaluewrapper") vector<Term>;
//%template(YAPTermVector) vector<YAPTerm>;
//%feature("novaluewrapper") vector<YAPTerm>;
};
%init %{
%}

6
swi/library/CMakeLists.txt
View File

@ -36,13 +36,7 @@ set (LIBRARY_PL
dcg/basics.pl dcg/basics.pl
) )
if (ANDROID)
file(INSTALL ${LIBRARY_PL} DESTINATION ${libpl})
else()
install(FILES ${LIBRARY_PL} install(FILES ${LIBRARY_PL}
DESTINATION ${libpl} DESTINATION ${libpl}
) )
endif()