From 470f10d51bc815c9274376ba05c079ac6b9a4c2b Mon Sep 17 00:00:00 2001
From: vsc <vsc@b08c6af1-5177-4d33-ba66-4b1c6b8b522a>
Date: Fri, 15 Feb 2002 22:31:22 +0000
Subject: [PATCH] get rid of some unnecessary choice-points in directives

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@363 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
---
 changes4.3.html   |  1 +
 pl/directives.yap | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/changes4.3.html b/changes4.3.html
index f36d3e16c..bf9461980 100644
--- a/changes4.3.html
+++ b/changes4.3.html
@@ -16,6 +16,7 @@
 
 <h2>Yap-4.3.21:</h2>
 <ul>
+	<li>FIXED: make fileerrors default for SICStus. (Nicos Angelopoulos)</li>
 	<li>FIXED: g(X) :- (Z is 2*X; a(Z)) Z cannot be seen as a free
 	var. (Nicos Angelopoulos).</li>
 	<li>FIXED: atom_concat was not allocating heap correctly (Nicos Angelopoulos).</li>
diff --git a/pl/directives.yap b/pl/directives.yap
index 0fd1b6d78..cacc27a8b 100644
--- a/pl/directives.yap
+++ b/pl/directives.yap
@@ -123,8 +123,8 @@ yap_flag(unhide,Atom) :- !, unhide(Atom).
 yap_flag(gc,V) :-
 	var(V), !,
 	( '$get_value'('$gc',[]) -> V = off ; V = on).
-yap_flag(gc,on) :- '$set_value'('$gc',true).
-yap_flag(gc,off) :- '$set_value'('$gc',[]).
+yap_flag(gc,on) :- !, '$set_value'('$gc',true).
+yap_flag(gc,off) :- !, '$set_value'('$gc',[]).
 yap_flag(gc_margin,N) :- 
 	var(N) -> 
 		 '$get_value'('$gc_margin',N)
@@ -137,15 +137,15 @@ yap_flag(gc_trace,V) :-
 	'$get_value'('$gc_verbose',N2),
 	'$get_value'('$gc_very_verbose',N3),
 	'$yap_flag_show_gc_tracing'(N1, N2, N3, V).
-yap_flag(gc_trace,on) :-
+yap_flag(gc_trace,on) :- !,
 	'$set_value'('$gc_trace',true),
 	'$set_value'('$gc_verbose',[]),
 	'$set_value'('$gc_very_verbose',[]).
-yap_flag(gc_trace,verbose) :-
+yap_flag(gc_trace,verbose) :- !,
 	'$set_value'('$gc_trace',[]),
 	'$set_value'('$gc_verbose',true),
 	'$set_value'('$gc_very_verbose',[]).
-yap_flag(gc_trace,very_verbose) :-
+yap_flag(gc_trace,very_verbose) :- !,
 	'$set_value'('$gc_trace',[]),
 	'$set_value'('$gc_verbose',true),
 	'$set_value'('$gc_very_verbose',true).
@@ -158,7 +158,7 @@ yap_flag(syntax_errors, V) :- var(V), !,
 yap_flag(syntax_errors, Option) :-
 	'$set_read_error_handler'(Option).
 % compatibility flag
-yap_flag(enhanced,on) :- '$set_value'('$enhanced',true).
+yap_flag(enhanced,on) :- !, '$set_value'('$enhanced',true).
 yap_flag(enhanced,off) :- '$set_value'('$enhanced',[]).
 %
 % show state of $
@@ -170,7 +170,7 @@ yap_flag(dollar_as_lower_case,V) :-
 %
 % make $a a legit atom
 %
-yap_flag(dollar_as_lower_case,on) :-
+yap_flag(dollar_as_lower_case,on) :- !,
 	'$change_type_of_char'(36,3).
 %
 % force quoting of '$a'
@@ -185,7 +185,7 @@ yap_flag(bounded,X) :-
 	var(X), !,
 	'$access_yap_flags'(0, X1),
 	'$transl_to_true_false'(X1,X).
-yap_flag(bounded,X) :-
+yap_flag(bounded,X) :- !,
 	(X = true ; X = false), !,
 	throw(error(permission_error(modify,flag,bounded),yap_flag(bounded,X))).
 yap_flag(bounded,X) :-
@@ -195,7 +195,7 @@ yap_flag(bounded,X) :-
 yap_flag(index,X) :- var(X), !,
 	 ( '$get_value'('$doindex',true) -> X=on ; X=off).
 yap_flag(index,on)  :- !, '$set_value'('$doindex',true).
-yap_flag(index,off) :- !, '$set_value'('$doindex',[]).
+yap_flag(index,off) :- '$set_value'('$doindex',[]).
 
 yap_flag(informational_messages,X) :- var(X), !,
 	 '$get_value'('$verbose',X).
@@ -500,7 +500,7 @@ yap_flag(host_type,X) :-
 	    V = gc_margin    ;
 	    V = gc_trace     ;
 %	    V = hide  ;
-%	    V = host_type  ;
+	    V = host_type  ;
 	    V = index ;
 	    V = informational_messages ;
 	    V = integer_rounding_function ;
@@ -606,9 +606,13 @@ yap_flag(host_type,X) :-
 	stream_property(OUT,[alias(Alias)]), !.
 	
 current_prolog_flag(V,Out) :-
-	(var(V) ; atom(V) ), !,
+	var(V), !,
 	'$show_yap_flag_opts'(V,NOut),
 	NOut = Out.
+current_prolog_flag(V,Out) :-
+	atom(V), !,
+	yap_flag(V,NOut),
+	NOut = Out.
 current_prolog_flag(V,Out) :-
 	throw(error(type_error(atom,V),current_prolog_flag(V,Out))).