From f6f7f70b7f21e17bdd2da70739c61e73ff00cdce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@dcc.fc.up.pt>
Date: Sun, 10 Nov 2013 11:18:00 +0000
Subject: [PATCH] handle verbosity and autoload

---
 pl/consult.yap | 23 +++++++++++++++++++----
 pl/modules.yap |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/pl/consult.yap b/pl/consult.yap
index f04ffeb2f..0a8d6692d 100755
--- a/pl/consult.yap
+++ b/pl/consult.yap
@@ -33,7 +33,7 @@
 load_files(Files,Opts) :-
 	'$load_files'(Files,Opts,load_files(Files,Opts)).
 
-'$lf_option'(autoload, 1, false).
+'$lf_option'(autoload, 1, _).
 '$lf_option'(derived_from, 2, false).
 '$lf_option'(encoding, 3, default).
 '$lf_option'(expand, 4, false).
@@ -70,7 +70,11 @@ load_files(Files,Opts) :-
 	arg( Id, TOpts, Val ).
 
 '$load_files'(Files, Opts, Call) :-
-	( '$nb_getval'('$lf_status', OldTOpts, fail), nonvar(OldTOpts) -> '$lf_opt'(silent, OldTOpts, OldVerbosity) ; true ),
+	( '$nb_getval'('$lf_status', OldTOpts, fail), nonvar(OldTOpts) ->
+	  '$lf_opt'(silent, OldTOpts, OldVerbosity),
+	  '$lf_opt'(autoload, OldTOpts, OldAutoload)
+	;
+	  true ),
 	'$check_files'(Files,load_files(Files,Opts)),
 	'$lf_option'(last_opt, LastOpt),
 	functor( TOpts, opt, LastOpt ),
@@ -85,7 +89,18 @@ load_files(Files,Opts) :-
 	'$check_use_module'(Call,UseModule),
 	'$lf_opt'('$use_module', TOpts, UseModule),
         '$current_module'(M0),
-	'$lf_opt'(silent, TOpts, Verbosity),
+	( '$lf_opt'(silent, TOpts, Verbosity),
+	  var(Verbosity) ->
+	  Verbosity = OldVerbosity
+	;
+	  true
+	),
+	( '$lf_opt'(autoload, TOpts, Autoload),
+	  var(Autoload) ->
+	  Autoload = OldAutoload
+	;
+	  true
+	),
 	% make sure we can run consult
 	'$init_system',
 	'$lf'(Files, M0, Call, TOpts).
@@ -315,9 +330,9 @@ use_module(M,F,Is) :-
 
 
 '$do_lf'(ContextModule, Stream, UserFile, TOpts) :-
-%	format( 'I=~w~n', [ContextModule=UserFile] ),
 	'$lf_opt'('$context_module', TOpts, ContextModule),
 	'$msg_level'( TOpts, Verbosity),
+%	format( 'I=~w~n', [Verbosity=UserFile] ),
 	% export to process
 	b_setval('$lf_status', TOpts),
 	'$reset_if'(OldIfLevel),
diff --git a/pl/modules.yap b/pl/modules.yap
index 5fa7165a6..956eb698f 100644
--- a/pl/modules.yap
+++ b/pl/modules.yap
@@ -359,7 +359,7 @@ expand_goal(G, G).
 	load_files([library(autoloader),
 		    autoloader:library('INDEX'),
 		    swi:library('dialect/swi/INDEX')],
-		   [silent(true),if(not_loaded)]),
+		   [autoload(true),if(not_loaded)]),
 	nb_setval('$autoloader_set', true),
 	yap_flag(autoload, true), 
 	'$enter_undefp',