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

support

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-08-21 23:31:21 -05:00
parent 9e59f755ff
commit fe1a677778
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C/stdpreds.c
View File

@ -1117,7 +1117,7 @@ void Yap_show_statistics(void) {
(Unsigned(TR) - Unsigned(LOCAL_TrailBase)))); (Unsigned(TR) - Unsigned(LOCAL_TrailBase))));
fprintf(stderr, "Runtime: %lds.\n", (unsigned long int)(runtime(PASS_REGS1))); fprintf(stderr, "Runtime: %lds.\n", (unsigned long int)(runtime(PASS_REGS1)));
fprintf(stderr, "Cputime: %lds.\n", (unsigned long int)(Yap_cputime())); fprintf(stderr, "Cputime: %lds.\n", (unsigned long int)(Yap_cputime()));
fprintf(stderr, "Walltime: %lu.\n", Yap_walltime() / 1000); fprintf(stderr, "Walltime: "UInt_F".\n", (UInt)(Yap_walltime() / 1000));
} }
static Int p_statistics_heap_max(USES_REGS1) { static Int p_statistics_heap_max(USES_REGS1) {

6
CMakeLists.txt
View File

@ -10,6 +10,9 @@ project( YAP )
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
cmake_policy(VERSION 3.4)
set( set(
CMAKE_MODULE_PATH CMAKE_MODULE_PATH
"${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}"
@ -103,6 +106,8 @@ add_library( # Sets the name of the library.
include(libYap NO_POLICY_SCOPE) include(libYap NO_POLICY_SCOPE)
target_link_libraries(libYap m pthread)
if (USE_READLINE) if (USE_READLINE)
target_link_libraries(libYap ${READLINE_LIBRARIES}) target_link_libraries(libYap ${READLINE_LIBRARIES})
endif (USE_READLINE) endif (USE_READLINE)
@ -111,6 +116,7 @@ endif (USE_READLINE)
if (ANDROID) if (ANDROID)
target_link_libraries(libYap android log) target_link_libraries(libYap android log)
endif () endif ()
set_target_properties(libYap set_target_properties(libYap

2
YAPDroid/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.2.0-alpha3' classpath 'com.android.tools.build:gradle:2.2.0-alpha7'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

1
packages/python/pypreds.c
View File

@ -56,7 +56,6 @@ static foreign_t python_f(term_t tmod, term_t fname, term_t tf) {
if (pF == NULL || !PyCallable_Check(pF)) { if (pF == NULL || !PyCallable_Check(pF)) {
return FALSE; return FALSE;
} }
printf("Module=%s ok\n", s);
return python_to_ptr(pF, tf); return python_to_ptr(pF, tf);
} }

5
packages/python/yap_kernel/jupyter.yap Normal file
View File

@ -0,0 +1,5 @@
:- if( current_prolog_flag(apple, true) ).
:- putenv( 'LC_CTYPE', 'en_us:UTF-8'),
:- endif.