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

Merge branch 'master' of ssh://ssh.dcc.fc.up.pt:31064/home/vsc/yap

Browse Source
This commit is contained in:
Vitor Santos Costa 2018-11-22 11:50:09 +00:00
commit b7cdaa10ec
19 changed files with 61 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C/errors.c
View File

@ -332,7 +332,7 @@ bool Yap_PrintWarning(Term twarning) {
PredEntry *pred = RepPredProp(PredPropByFunc( PredEntry *pred = RepPredProp(PredPropByFunc(
FunctorPrintMessage, PROLOG_MODULE)); // PROCEDURE_print_message2; FunctorPrintMessage, PROLOG_MODULE)); // PROCEDURE_print_message2;
__android_log_print(ANDROID_LOG_INFO, "YAPDroid ", " warning(%s)", __android_log_print(ANDROID_LOG_INFO, "YAPDroid ", " warning(%s)",
Yap_TermToBuffer(twarning, Quote_illegal_f | Ignore_ops_f | Unfold_cyclics_f)); Yap_TermToBuffer(twarning, Quote_illegal_f | Ignore_ops_f | Ignore_cyclics_f));
Term cmod = (CurrentModule == PROLOG_MODULE ? TermProlog : CurrentModule); Term cmod = (CurrentModule == PROLOG_MODULE ? TermProlog : CurrentModule);
bool rc; bool rc;
Term ts[2], err; Term ts[2], err;

8
CMakeLists.txt
View File

@ -351,14 +351,10 @@ list(APPEND YAP_SYSTEM_OPTIONS big_numbers)
if (GMP_FOUND) if (GMP_INCLUDE_DIRS)
#config.h needs this (TODO: change in code latter) #config.h needs this (TODO: change in code latter)
include_directories(${GMP_INCLUDE_DIRS}) include_directories(${GMP_INCLUDE_DIRS})
check_include_file(gmp.h HAVE_GMP_H) endif ()
check_include_file_cxx(gmpxx.h HAVE_GMPXX_H)
endif (GMP_FOUND)
if (WITH_READLINE) if (WITH_READLINE)

2
CXX/yapi.hh
View File

@ -16,7 +16,7 @@ extern "C" {
#include "YapConfig.h" #include "YapConfig.h"
} }
#if HAVE_GMPXX_H #if HAVE_GMPXX_H || defined(__ANDROID__)
#include <gmpxx.h> #include <gmpxx.h>
#elif HAVE_GMP_H #elif HAVE_GMP_H
#include <gmp.h> #include <gmp.h>

2
H/CMakeLists.txt
View File

@ -19,3 +19,5 @@ add_custom_command( OUTPUT ${CMAKE_TOP_BINARY_DIR}/dlocals.h
DEPENDS locals.h ) DEPENDS locals.h )
install(FILES ${INCLUDE_HEADERS} ${CORE_HEADERS} ${OPTYap_HEADERS} ${YAPOS_HEADERS} ${CONFIGURATION_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Yap )

2
H/Yap.h
View File

@ -776,7 +776,7 @@ extern struct worker_local Yap_local;
#define REMOTE(wid) (&Yap_local) #define REMOTE(wid) (&Yap_local)
#endif #endif
#include "encoding.h" #include "YapEncoding.h"
#include <stdio.h> #include <stdio.h>
#define YP_FILE FILE #define YP_FILE FILE

2
H/Yapproto.h
View File

@ -470,7 +470,7 @@ extern void Yap_InitAbsmi(void);
extern void Yap_InitUnify(void); extern void Yap_InitUnify(void);
extern void Yap_TrimTrail(void); extern void Yap_TrimTrail(void);
extern int Yap_Unifiable(Term d0, Term d1); extern int Yap_Unifiable(Term d0, Term d1);
extern int Yap_IUnify(register CELL d0, register CELL d1); extern int Yap_IUnify( CELL d0, CELL d1);
/* userpreds.c */ /* userpreds.c */
extern void Yap_InitUserCPreds(void); extern void Yap_InitUserCPreds(void);

2
cmake/Sources.cmake
View File

@ -253,8 +253,6 @@ set (OPTYap_HEADERS
) )
set (YAPOS_HEADERS set (YAPOS_HEADERS
${CMAKE_SOURCE_DIR}/os/encoding.h
${CMAKE_SOURCE_DIR}/os/fmemopen.h
${CMAKE_SOURCE_DIR}/os/format.h ${CMAKE_SOURCE_DIR}/os/format.h
${CMAKE_SOURCE_DIR}/os/getw.h ${CMAKE_SOURCE_DIR}/os/getw.h
${CMAKE_SOURCE_DIR}/os/iopreds.h ${CMAKE_SOURCE_DIR}/os/iopreds.h

4
config.h.cmake
View File

@ -1884,7 +1884,9 @@ signal. */
#endif #endif
/* use bignums/rationals in YAP code. */ /* use bignums/rationals in YAP code. */
#ifndef USE_GMP #if defined( __ANDROID__ ) && !defined(USE_GMP)
#define USE_GMP 1
#elif !defined(USE_GMP)
#define USE_GMP ${GMP_FOUND} #define USE_GMP ${GMP_FOUND}
#endif #endif

2
include/VFS.h
View File

@ -31,7 +31,7 @@
#endif #endif
#endif #endif
#include <encoding.h> #include <YapEncoding.h>
typedef struct { typedef struct {
dev_t st_dev; /* ID of device containing file */ dev_t st_dev; /* ID of device containing file */

2
include/YapDefs.h
View File

@ -69,7 +69,7 @@ typedef int (*YAP_agc_hook)(void *_Atom);
#include "YapError.h" #include "YapError.h"
#include "../os/encoding.h" #include "YapEncoding.h"
typedef encoding_t YAP_encoding_t; typedef encoding_t YAP_encoding_t;

0
os/encoding.h → include/YapEncoding.h
View File

2
include/YapTerm.h
View File

@ -116,7 +116,7 @@ typedef void *YAP_Functor;
#include "YapError.h" #include "YapError.h"
#include "../os/encoding.h" #include "YapEncoding.h"
typedef encoding_t YAP_encoding_t; typedef encoding_t YAP_encoding_t;

2
os/CMakeLists.txt
View File

@ -2,7 +2,7 @@ set (YAPOS_HEADERS
getw.h getw.h
iopreds.h iopreds.h
yapio.h yapio.h
encoding.h YapEncoding.h
) )
set (YAPOS_SOURCES set (YAPOS_SOURCES

2
os/readutil.c
View File

@ -22,7 +22,7 @@ static char SccsId[] = "%W% %G%";
#include "YapHeap.h" #include "YapHeap.h"
#include "YapText.h" #include "YapText.h"
#include "Yatom.h" #include "Yatom.h"
#include "encoding.h" #include "YapEncoding.h"
#include "iopreds.h" #include "iopreds.h"
#include "yapio.h" #include "yapio.h"

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

@ -1,6 +1,7 @@
# This is a CMake file for SWIG and Android # This is a CMake file for SWIG and Android
set (SWIG_CXX_DIR ${YAP_APP_DIR}/src/generated/jni)
FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/generated/java/pt/up/yap/lib ) FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/generated/java/pt/up/yap/lib )
FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/generated/assets) FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/generated/assets)
FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/generated/jni) FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/generated/jni)
@ -16,42 +17,43 @@ FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/generated/jni)
set (GMP_INCLUDE_DIRS ${GMP_ROOT}) set (GMP_INCLUDE_DIRS ${GMP_ROOT})
set (GMP_LIBRARIES ${GMP_ROOT}/libgmp.so) set (GMP_LIBRARIES ${GMP_ROOT}/libgmp.so)
#
add_custom_target (pllib # add_custom_target (pllib
COMMAND ${CMAKE_COMMAND} -E make_directory ${YAP_INSTALL_DATADIR} # COMMAND ${CMAKE_COMMAND} -E make_directory ${YAP_INSTALL_DATADIR}
COMMAND ${CMAKE_COMMAND} -E copy ${pl_library} ${YAP_INSTALL_DATADIR} # COMMAND ${CMAKE_COMMAND} -E copy ${pl_library} ${YAP_INSTALL_DATADIR}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/android.yap ${YAP_INSTALL_DATADIR} # COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/android.yap ${YAP_INSTALL_DATADIR}
DEPENDS ${pl_library} # DEPENDS ${pl_library}
) #)
#
add_custom_target (pllibpl # add_custom_target (pllibpl
COMMAND ${CMAKE_COMMAND} -E make_directory ${YAP_INSTALL_DATADIR}/pl # COMMAND ${CMAKE_COMMAND} -E make_directory ${YAP_INSTALL_DATADIR}/pl
COMMAND ${CMAKE_COMMAND} -E copy ${pl_boot_library} ${YAP_INSTALL_DATADIR}/pl # COMMAND ${CMAKE_COMMAND} -E copy ${pl_boot_library} ${YAP_INSTALL_DATADIR}/pl
DEPENDS pllib ${pl_boot_library} #DEPENDS pllib ${pl_boot_library}
) # )
add_custom_target (pllibos ALL # add_custom_target (pllibos ALL
COMMAND ${CMAKE_COMMAND} -E make_directory ${YAP_INSTALL_DATADIR}/os # COMMAND ${CMAKE_COMMAND} -E make_directory ${YAP_INSTALL_DATADIR}/os
COMMAND ${CMAKE_COMMAND} -E copy ${pl_os_library} ${YAP_INSTALL_DATADIR}/os # COMMAND ${CMAKE_COMMAND} -E copy ${pl_os_library} ${YAP_INSTALL_DATADIR}/os
DEPENDS pllibpl ${pl_os_library} #DEPENDS pllibpl ${pl_os_library}
) # )
#
add_custom_command (OUTPUT ${CMAKE_SWIG_OUTPUT}/swig_streamer.cpp # add_custom_command (OUTPUT ${CMAKE_SWIG_OUTPUT}/swig_streamer.cpp
COMMAND ${SWIG_EXECUTABLE} -c++ -java -package ${SWIG_MODULE_NAME} -O -outdir ${CMAKE_SWIG_OUTDIR} -addextern -I${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SWIG_OUTPUT}/swig_streamer.cpp -oh ${CMAKE_SWIG_OUTPUT}/swig_streamer.hh streamer.i # COMMAND ${SWIG_EXECUTABLE} -c++ -java -package ${SWIG_MODULE_NAME} -O -outdir ${CMAKE_SWIG_OUTDIR} -addextern -I${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SWIG_OUTPUT}/swig_streamer.cpp -oh ${CMAKE_SWIG_OUTPUT}/swig_streamer.hh streamer.i
DEPENDS streamer.i # DEPENDS streamer.i
) # )
#
add_custom_command (OUTPUT ${CMAKE_SWIG_OUTPUT}/yap_swig.cpp # add_custom_command (OUTPUT ${CMAKE_SWIG_OUTPUT}/yap_swig.cpp
COMMAND ${SWIG_EXECUTABLE} -c++ -java -package ${SWIG_MODULE_NAME} -O -outdir ${CMAKE_SWIG_OUTDIR} -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 ${CMAKE_SWIG_OUTPUT}/yap_swig.cpp -oh ${CMAKE_SWIG_OUTPUT}/yap_swig.hh ${SWIG_SOURCES} # COMMAND ${SWIG_EXECUTABLE} -c++ -java -package ${SWIG_MODULE_NAME} -O -outdir ${CMAKE_SWIG_OUTDIR} -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 ${CMAKE_SWIG_OUTPUT}/yap_swig.cpp -oh ${CMAKE_SWIG_OUTPUT}/yap_swig.hh ${SWIG_SOURCES}
DEPENDS pllibos ${SWIG_SOURCES} YAP++) # DEPENDS pllibos ${SWIG_SOURCES} YAP++)
#
add_library(YAPJava OBJECT add_library(YAPJava OBJECT
${CMAKE_SWIG_OUTPUT}/swig_streamer.cpp ${SWIG_CXX_DIR}/streamer_swig.cxx
${CMAKE_SWIG_OUTPUT}/yap_swig.cpp ${SWIG_CXX_DIR}/yapi_swig.cxx
streamer.cpp streamer.cpp
) )
set_target_properties(YAPJava PROPERTIES LINKER_LANGUAGE CXX)
# GMP_FOUND - true if GMP/MPIR was found # GMP_FOUND - true if GMP/MPIR was found
# GMP_INCLUDE_DIRS - include search path # GMP_INCLUDE_DIRS - include search path

9
packages/swig/android/streamer.cpp
View File

@ -77,15 +77,6 @@ static int64_t and_seek(int sno, int64_t where, int how) {
static void static void
and_flush(int sno) { and_flush(int sno) {
buff0 += '\0';
streamerInstance->display(buff0);
//
// Created by vsc on 11-07-2017.
//
} }

3
pl/consult.yap
View File

@ -704,6 +704,9 @@ db_files(Fs) :-
'$csult'(Fs, M) :- '$csult'(Fs, M) :-
load_files(M:Fs,[consult(consult)]). load_files(M:Fs,[consult(consult)]).
'$csult_in_mod'(M, -F ) :- $load_files'(M:F,[],[M:F])
'$csult_in_mod'(M, F ) :- $load_files'(M:F,[consult(consult)],[M:F])
'$extract_minus'([], []). '$extract_minus'([], []).
'$extract_minus'([-F|Fs], [F|MFs]) :- '$extract_minus'([-F|Fs], [F|MFs]) :-
'$extract_minus'(Fs, MFs). '$extract_minus'(Fs, MFs).

12
pl/top.yap
View File

@ -712,11 +712,15 @@ write_query_answer( Bindings ) :-
'$call'(not(X), _CP, G0, M) :- !, '$call'(not(X), _CP, G0, M) :- !,
\+ ('$current_choice_point'(CP), \+ ('$current_choice_point'(CP),
'$call'(X,CP,G0,M) ). '$call'(X,CP,G0,M) ).
'$call'(!, CP, _,_) :- !, '$call'(!, CP, CP,G0) :- !,
'$$cut_by'(CP). '$$cut_by'(CP).
'$call'([A|B], _, _, M) :- !, '$call'([X|Y], _, _, M) :-
'$csult'([A|B], M). (Y == [] ->
'$call'(G, _CP, _G0, CurMod) :- consult(M:X)
;
'$csult'([X|Y] ,M)
),
$call'(G, _CP, _G0, CurMod) :-
% /* % /*
% ( % (
% '$is_metapredicate'(G,CurMod) % '$is_metapredicate'(G,CurMod)

2
swi/library/predicate_options.pl
View File

@ -2811,7 +2811,7 @@ erroris
supported:a supported:a
781 ^ : 781 ^ :
#include "encoding.h" #include "YapEncoding.h"
#includeIn file included from #includeIn file included from
/Users/vsc/github/yap-6.3/H/YapHandles.h ^ : /Users/vsc/github/yap-6.3/H/YapHandles.h ^ :