[Yap-commits] CVS: pl boot.yap, 1.188, 1.189 consult.yap, 1.77, 1.78 messages.yap, 1.13, 1.14

[Vitor S. C. <vs...@us...>]

Update of /cvsroot/yap/pl
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30868/pl

Modified Files:
	boot.yap consult.yap messages.yap 
Log Message:
fixes by Bart and Tom: mostly libraries but nasty one in indexing 
compilation.


Index: boot.yap
===================================================================
RCS file: /cvsroot/yap/pl/boot.yap,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- boot.yap	16 Jun 2008 21:22:15 -0000	1.188
+++ boot.yap	11 Jul 2008 17:02:09 -0000	1.189
@@ -300,7 +300,8 @@
  '$execute_commands'([],_,_,_) :- !, fail.
  '$execute_commands'([C|Cs],VL,Con,Source) :- !,
 	 (
-	   '$execute_command'(C,VL,Con,Source)
+	   '$execute_command'(C,VL,Con,Source),
+	   fail	
 	 ;
 	   '$execute_commands'(Cs,VL,Con,Source)
 	 ),
@@ -1064,7 +1065,7 @@
 
 expand_term(Term,Expanded) :-
 	( \+ '$undefined'(term_expansion(_,_), user),
-	  user:term_expansion(Term,Expanded)
+	  once(user:term_expansion(Term,Expanded))
         ;
 	  '$expand_term_grammar'(Term,Expanded)
 	),

Index: consult.yap
===================================================================
RCS file: /cvsroot/yap/pl/consult.yap,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- consult.yap	12 Jun 2008 10:55:52 -0000	1.77
+++ consult.yap	11 Jul 2008 17:02:10 -0000	1.78
@@ -27,7 +27,7 @@
 % silent(true,false)  => implemented
 % stream(Stream)  => implemented
 % consult(consult,reconsult) => implemented
-% compilation_mode(compile,source,assert_all) => implemented
+% compilation_mode(compact,source,assert_all) => implemented
 %
 load_files(Files,Opts) :-
 	'$load_files'(Files,Opts,load_files(Files,Opts)).
@@ -92,7 +92,7 @@
 	nb_setval('$lf_verbose',silent).
 '$process_lf_opt'(skip_unix_comments,_,_,_,_,_,_,_,_,skip_unix_comments,_,_,_,_).
 '$process_lf_opt'(compilation_mode(source),_,_,_,_,_,_,_,_,_,source,_,_,_).
-'$process_lf_opt'(compilation_mode(compile),_,_,_,_,_,_,_,_,_,compile,_,_,_).
+'$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,_,_).
@@ -253,7 +253,7 @@
 	),
 	'$change_alias_to_stream'('$loop_stream',OldStream),
 	'$set_yap_flags'(18,GenerateDebug),
-	'$comp_mode'(_, OldCompMode),
+	'$comp_mode'(CompMode, OldCompMode),
 	nb_setval('$consulting',Old),
 	nb_setval('$consulting_file',OldF),
 	cd(OldD),
@@ -872,33 +872,22 @@
 '$if_directive'((:- elif(_))).
 '$if_directive'((:- endif)).
 
-'$comp_mode'(OldCompMode, CompMode) :-
-	(
-	 nb_getval('$assert_all',on)
-	->
-	 OldCompMode = assert_all
-	;
-	 '$access_yap_flags'(11,1)
-	->
-	 OldCompMode = source
-	;
-	 OldCompMode = compile
-	),
-	(
-	 var(CompMode) ->
-	 true
-	;
-	 CompMode == assert_all
-	->
-	 nb_setval('$assert_all',on)
-	;
-	 CompMode == source
-	->
-	 nb_setval('$assert_all',off),
-	 '$set_yap_flags'(11,1)
-	;
-	 nb_setval('$assert_all',off),
-	 '$set_yap_flags'(11,0)
-	).
 
+'$comp_mode'(_OldCompMode, CompMode) :-
+	var(CompMode), !. % just do nothing.
+'$comp_mode'(OldCompMode, assert_all) :-
+	'$fetch_comp_status'(OldCompMode),
+	nb_setval('$assert_all',on).
+'$comp_mode'(OldCompMode, source) :-
+	'$fetch_comp_status'(OldCompMode),
+	'$set_yap_flags'(11,1).
+'$comp_mode'(OldCompMode, compact) :-
+	'$fetch_comp_status'(OldCompMode),
+	'$set_yap_flags'(11,0).
+
+'$fetch_comp_status'(assert_all) :-
+	nb_getval('$assert_all',on), !.
+'$fetch_comp_status'(source) :-
+	 '$get_yap_flags'(11,1).
+'$fetch_comp_status'(compact).
 

Index: messages.yap
===================================================================
RCS file: /cvsroot/yap/pl/messages.yap,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- messages.yap	16 Jun 2008 21:22:15 -0000	1.13
+++ messages.yap	11 Jul 2008 17:02:10 -0000	1.14
@@ -106,7 +106,7 @@
 system_message(debug(trace)) -->
 	[ 'Trace mode on.' ].
 system_message(declaration(Args,Action)) -->
-	[ 'declaration ~w ~w.',	[Args,Action] ].
+	[ 'declaration ~w ~w.' - [Args,Action] ].
 system_message(defined_elsewhere(P,F)) -->
 	[  'predicate ~q previously defined in file ~w' - [P,F] ].
 system_message(import(Pred,To,From,private)) -->