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

configuration fixes

Browse Source
This commit is contained in:
Vitor Santos Costa 2018-11-23 10:55:05 +00:00
parent 9be6eb9132
commit 999de8df19
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C/yap-args.c
View File

@ -198,7 +198,7 @@ static bool consult(const char *b_file USES_REGS) {
t = ArgOfTerm(1, t); t = ArgOfTerm(1, t);
if (IsApplTerm(t) && FunctorOfTerm(t) == functor_compile2) { if (IsApplTerm(t) && FunctorOfTerm(t) == functor_compile2) {
consult(RepAtom(AtomOfTerm(ArgOfTerm(1, t)))->StrOfAE); consult(RepAtom(AtomOfTerm(ArgOfTerm(1, t)))->StrOfAE);
Yap_PopException(); Yap_ResetException(LOCAL_ActiveError);
} else { } else {
YAP_RunGoalOnce(t); YAP_RunGoalOnce(t);
} }

2
packages/jpl/src/c/jpl.c
View File

@ -640,7 +640,7 @@ static JNIEnv*
jni_env(void) /* economically gets a JNIEnv pointer, valid for this thread */ jni_env(void) /* economically gets a JNIEnv pointer, valid for this thread */
{ JNIEnv *env; { JNIEnv *env;
switch( (*jvm)->GetEnv(jvm, (void**)&env, JNI_VERSION_1_4) ) switch( (*jvm)->GetEnv(jvm, (void**)&env, JNI_VERSION_1_8) )
{ case JNI_OK: { case JNI_OK:
return env; return env;
case JNI_EDETACHED: case JNI_EDETACHED:

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

@ -2,10 +2,11 @@ if (WITH_SQLITE3)
message( " * Sqlite3 Data-Base (http://www.sqlite3.org), distributed with MYDDAS" ) message( " * Sqlite3 Data-Base (http://www.sqlite3.org), distributed with MYDDAS" )
set (SQLITE_EXTRA set (SQLITE_TEST
chinook.db
sqlitest.yap) sqlitest.yap)
set (SQLITE_DB chinook.db)
set( YAPSQLITE3_SOURCES set( YAPSQLITE3_SOURCES
myddas_sqlite3.c myddas_sqlite3.c
src/sqlite3.h src/sqlite3.h
@ -65,8 +66,12 @@ if (WITH_SQLITE3)
) )
endif() endif()
install(FILES ${SQLITE_EXTRA} install(FILES ${SQLITE_DB}
DESTINATION ${YAP_PLDIR}/data DESTINATION ${YAP_PLDIR}/data
) )
install(FILES ${SQLITE_TEST}
DESTINATION ${YAP_PLDIR}/test
)
endif() endif()

2
pl/boot.yap
View File

@ -476,7 +476,7 @@ If this hook preodicate succeeds it must instantiate the _Action_ argument to t
:- ensure_loaded('../pl/pathconf.yap'). :- ensure_loaded('../pl/pathconf.yap').
:- ( get_prolog_flag(android,true) -> ensure_loaded(library(android)) ; true ). :- ensure_loaded('../pl/android.yap').

2
pl/pathconf.yap
View File

@ -112,6 +112,8 @@ foreign_directory(yap('lib/Yap')).
~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
*/ */
:- multifile prolog_file_type/2.
:- discontiguous prolog_file_type/2.
:- dynamic prolog_file_type/2. :- dynamic prolog_file_type/2.
prolog_file_type(yap, prolog). prolog_file_type(yap, prolog).