From 2647c3593934b22ea6ed670a9a6ca3eb72100f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Mon, 14 Jun 2010 08:46:58 +0100 Subject: [PATCH 1/4] get rid of wrong docs. --- GIT | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/GIT b/GIT index 5e4c83e82..6bd7e5185 100644 --- a/GIT +++ b/GIT @@ -4,16 +4,7 @@ You need at least git-1.6 to install the development version. Please proceed as follows for the main branch: git clone git://gitorious.org/yap-git/mainline.git yap -cd yap -./configure - -Please proceed as follows for the development branch: - -git clone git://gitorious.org/yap-git/mainline.git yap -cd yap -git branch --track devel origin/devel -git checkout devel -git submodule add git://prolog.cs.vu.nl/home/pl/git/chr.git packages/chr -git submodule add git://prolog.cs.vu.nl/home/pl/git/clpqr.git packages/clpqr -./configure +cd yap-6 +git submodule init +git submodule update From 43cc87557122cb4a1c32884906ae71d79f228b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Mon, 14 Jun 2010 08:47:15 +0100 Subject: [PATCH 2/4] fix verbose_load (obs from Paulo Moura). --- pl/consult.yap | 26 ++++++++++++++++---------- pl/flags.yap | 3 ++- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/pl/consult.yap b/pl/consult.yap index 93e61a63e..4e91efc57 100755 --- a/pl/consult.yap +++ b/pl/consult.yap @@ -66,7 +66,7 @@ load_files(Files,Opts) :- '$process_lf_opts'(V,_,_,_,_,_,_,_,_,_,_,_,_,Call) :- var(V), !, '$do_error'(instantiation_error,Call). -'$process_lf_opts'([],_,_,_,_,_,_,_,Encoding,_,_,_,_,_) :- +'$process_lf_opts'([],_,InfLevel,_,_,_,_,_,Encoding,_,_,_,_,_) :- (var(Encoding) -> '$default_encoding'(Encoding) ; @@ -78,12 +78,16 @@ load_files(Files,Opts) :- '$process_lf_opts'([Opt|_],_,_,_,_,_,_,_,_,_,_,_,_,Call) :- '$do_error'(domain_error(unimplemented_option,Opt),Call). -'$process_lf_opt'(autoload(true),_,InfLevel,_,_,_,_,_,_,_,_,_,_,_) :- +'$process_lf_opt'(autoload(true),Silent,InfLevel,_,_,_,_,_,_,_,_,_,_,_) :- get_value('$verbose_auto_load',VAL), (VAL = true -> - InfLevel = informational + InfLevel = informational, + (get_value('$lf_verbose',informational) -> true ; Silent = silent), + set_value('$lf_verbose',informational) ; - InfLevel = silent + InfLevel = silent, + (get_value('$lf_verbose',silent) -> true ; Silent = informational), + set_value('$lf_verbose',silent) ). '$process_lf_opt'(autoload(false),_,_,_,_,_,_,_,_,_,_,_,_,_). '$process_lf_opt'(derived_from(File),_,_,_,_,_,_,_,_,_,_,_,Files,Call) :- @@ -112,13 +116,15 @@ load_files(Files,Opts) :- '$do_error'(domain_error(unimplemented_option,qcompile),Call). '$process_lf_opt'(qcompile(false),_,_,_,_,false,_,_,_,_,_,_,_,_). '$process_lf_opt'(silent(true),Silent,silent,_,_,_,_,_,_,_,_,_,_,_) :- - ( nb_getval('$lf_verbose',Silent) -> true ; Silent = informational), - nb_setval('$lf_verbose',silent). + ( get_value('$lf_verbose',silent) -> true ; Silent = informational), + set_value('$lf_verbose',silent). +'$process_lf_opt'(silent(false),Silent,informational,_,_,_,_,_,_,_,_,_,_,_) :- + ( get_value('$lf_verbose',informational) -> true ; Silent = silent), + set_value('$lf_verbose',informational). '$process_lf_opt'(skip_unix_comments,_,_,_,_,_,_,_,_,skip_unix_comments,_,_,_,_). '$process_lf_opt'(compilation_mode(source),_,_,_,_,_,_,_,_,_,source,_,_,_). '$process_lf_opt'(compilation_mode(compact),_,_,_,_,_,_,_,_,_,compact,_,_,_). '$process_lf_opt'(compilation_mode(assert_all),_,_,_,_,_,_,_,_,_,assert_all,_,_,_). -'$process_lf_opt'(silent(false),_,_,_,_,_,_,_,_,_,_,_,_,_). '$process_lf_opt'(consult(reconsult),_,_,_,_,_,_,_,_,_,_,reconsult,_,_). '$process_lf_opt'(consult(consult),_,_,_,_,_,_,_,_,_,_,consult,_,_). '$process_lf_opt'(stream(Stream),_,_,_,_,_,_,Stream,_,_,_,_,Files,Call) :- @@ -172,7 +178,7 @@ load_files(Files,Opts) :- '$close_lf'(Silent) :- nonvar(Silent), !, - nb_setval('$lf_verbose',Silent). + set_value('$lf_verbose',Silent). '$close_lf'(_). ensure_loaded(Fs) :- @@ -303,7 +309,7 @@ use_module(M,F,Is) :- '$consult_infolevel'(InfoLevel) :- nonvar(InfoLevel), !. '$consult_infolevel'(InfoLevel) :- - nb_getval('$lf_verbose',InfoLevel), InfoLevel \= [], !. + get_value('$lf_verbose',InfoLevel), InfoLevel \= [], !. '$consult_infolevel'(informational). '$start_reconsulting'(F) :- @@ -413,7 +419,7 @@ use_module(M,F,Is) :- '$include'(F, Status), '$include'(Fs, Status). '$include'(X, Status) :- - nb_getval('$lf_verbose',Verbosity), + get_value('$lf_verbose',Verbosity), '$find_in_path'(X,Y,include(X)), nb_getval('$included_file',OY), nb_setval('$included_file', Y), diff --git a/pl/flags.yap b/pl/flags.yap index 7540e8f1c..ef9f5db73 100644 --- a/pl/flags.yap +++ b/pl/flags.yap @@ -730,7 +730,7 @@ yap_flag(verbose_load,false) :- !, set_value('$lf_verbose',silent), '$set_yap_flags'(7,1). yap_flag(verbose_load,X) :- - '$do_error'(domain_error(flag_value,verbose_auto_load+X),yap_flag(verbose_auto_load,X)). + '$do_error'(domain_error(flag_value,verbose_load+X),yap_flag(verbose_load,X)). yap_flag(verbose_auto_load,X) :- var(X), !, @@ -848,6 +848,7 @@ yap_flag(dialect,yap). '$yap_system_flag'(user_output). '$yap_system_flag'(variable_names_may_end_with_quotes). '$yap_system_flag'(verbose). +'$yap_system_flag'(verbose_load). '$yap_system_flag'(verbose_auto_load). '$yap_system_flag'(version). '$yap_system_flag'(version_data). From dc4557c707bdecbaf56b8b40e300f98c8ec0495f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Mon, 14 Jun 2010 08:56:05 +0100 Subject: [PATCH 3/4] more fixes to verbose_load --- pl/boot.yap | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pl/boot.yap b/pl/boot.yap index 81b33410a..808365247 100755 --- a/pl/boot.yap +++ b/pl/boot.yap @@ -112,7 +112,7 @@ true :- true. nb_setval('$debug_jump',off). '$init_consult' :- - nb_setval('$lf_verbose',informational), + set_value('$lf_verbose',informational), nb_setval('$if_level',0), nb_setval('$endif',off), nb_setval('$consulting_file',[]), @@ -1044,10 +1044,10 @@ break :- '$silent_bootstrap'(F) :- '$init_globals', nb_setval('$if_level',0), - nb_getval('$lf_verbose',OldSilent), - nb_setval('$lf_verbose',silent), + get_value('$lf_verbose',OldSilent), + set_value('$lf_verbose',silent), bootstrap(F), - nb_setval('$lf_verbose', OldSilent). + set_value('$lf_verbose', OldSilent). bootstrap(F) :- '$open'(F, '$csult', Stream, 0, 0, F), @@ -1057,7 +1057,7 @@ bootstrap(F) :- getcwd(OldD), cd(Dir), ( - nb_getval('$lf_verbose',silent) + get_value('$lf_verbose',silent) -> true ; @@ -1068,7 +1068,7 @@ bootstrap(F) :- cd(OldD), '$end_consult', ( - nb_getval('$lf_verbose',silent) + get_value('$lf_verbose',silent) -> true ; From a055cc4637c29b4e816b042ddda0e10a58ea54fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Mon, 14 Jun 2010 08:56:21 +0100 Subject: [PATCH 4/4] meta declarations for thread stuff (from Paulo Moura). --- pl/threads.yap | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pl/threads.yap b/pl/threads.yap index 33e8b6866..b50fbf9df 100644 --- a/pl/threads.yap +++ b/pl/threads.yap @@ -16,12 +16,14 @@ *************************************************************************/ :- meta_predicate - thread_create(:,-,:), - thread_create(:,-), - thread_create(:), - thread_at_exit(:), - thread_signal(+,:), - with_mutex(+,:), + thread_initialization(0), + thread_at_exit(0), + thread_create(0, -, :), + thread_create(0, -), + thread_create(0), + thread_signal(+, 0), + with_mutex(+, 0), + thread_signal(+,0), volatile(:). volatile(P) :- var(P),