From 9d07b519371300f06d0cb9dc7398b3cd2339dbb6 Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Tue, 21 Apr 2009 15:19:26 -0500 Subject: [PATCH] make sure we don't redo things. --- pl/boot.yap | 1 + pl/consult.yap | 6 +++++- pl/directives.yap | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pl/boot.yap b/pl/boot.yap index 1df3d7281..034f2d76b 100644 --- a/pl/boot.yap +++ b/pl/boot.yap @@ -102,6 +102,7 @@ true :- true. nb_setval('$if_level',0), nb_setval('$endif',off), nb_setval('$consulting_file',[]), + nb_setval('$initialization_goals',off), nb_setval('$consulting',false), nb_setval('$included_file',[]). diff --git a/pl/consult.yap b/pl/consult.yap index 25310dd0e..096f2b990 100644 --- a/pl/consult.yap +++ b/pl/consult.yap @@ -302,6 +302,9 @@ use_module(M,F,Is) :- fail. '$initialization'(_). +'$exec_initialisation_goals' :- + nb_setval('$initialization_goals',on), + fail. '$exec_initialisation_goals' :- recorded('$blocking_code',_,R), erase(R), @@ -331,7 +334,8 @@ use_module(M,F,Is) :- '$enter_system_mode', fail ). -'$exec_initialisation_goals'. +'$exec_initialisation_goals' :- + nb_setval('$initialization_goals',off). '$include'(V, _) :- var(V), !, '$do_error'(instantiation_error,include(V)). diff --git a/pl/directives.yap b/pl/directives.yap index 9ceab1a45..525859971 100644 --- a/pl/directives.yap +++ b/pl/directives.yap @@ -244,8 +244,10 @@ yap_flag(generate_debug_info,false) :- !, yap_flag(generate_debug_info,X) :- '$do_error'(domain_error(flag_value,generate_debug_info+X),yap_flag(generate_debug_info,X)). -'$enable_restore_flag_info'(_Flag) :- +'$enable_restore_flag_info'(_) :- nb_getval('$consulting_file',[]), !. +'$enable_restore_flag_info'(_) :- + nb_getval('$initialization_goals',on), !. '$enable_restore_flag_info'(Flag) :- '$show_consult_level'(Level1), yap_flag(Flag, Info),