fix style_checking flags and especially variables.

pl/checker.yap

@@ -68,11 +68,11 @@
 :- op(1150, fx, multifile).
 
 style_check(V) :- var(V), !, fail.
-style_check(all) :- '$syntax_check_mode'(_,on),
+style_check(all) :-
 	'$syntax_check_single_var'(_,on),
 	'$syntax_check_discontiguous'(_,on),
 	'$syntax_check_multiple'(_,on).
-style_check(single_var) :- '$syntax_check_mode'(_,on),
+style_check(single_var) :-
 	'$syntax_check_single_var'(_,on).
 style_check(singleton) :-
 	style_check(single_var).
@@ -80,11 +80,11 @@ style_check(-single_var) :-
 	no_style_check(single_var).
 style_check(-singleton) :-
 	no_style_check(single_var).
-style_check(discontiguous) :- '$syntax_check_mode'(_,on),
+style_check(discontiguous) :-
 	'$syntax_check_discontiguous'(_,on).
 style_check(-discontiguous) :-
 	no_style_check(discontiguous).
-style_check(multiple) :- '$syntax_check_mode'(_,on),
+style_check(multiple) :-
 	'$syntax_check_multiple'(_,on).
 style_check(-multiple) :-
 	no_style_check(multiple).
@@ -92,31 +92,46 @@ style_check([]).
 style_check([H|T]) :- style_check(H), style_check(T).
 
 no_style_check(V) :- var(V), !, fail.
-no_style_check(all) :- '$syntax_check_mode'(_,off),
+no_style_check(all) :-
 	'$syntax_check_single_var'(_,off),
 	'$syntax_check_discontiguous'(_,off),
 	'$syntax_check_multiple'(_,off).
-no_style_check(single_var) :- '$syntax_check_mode'(_,off),
+no_style_check(single_var) :-
 	'$syntax_check_single_var'(_,off).
-no_style_check(discontiguous) :- '$syntax_check_mode'(_,off),
+no_style_check(discontiguous) :-
 	'$syntax_check_discontiguous'(_,off).
-no_style_check(multiple) :- '$syntax_check_mode'(_,on),
+no_style_check(multiple) :-
 	'$syntax_check_multiple'(_,off).
 no_style_check([]).
 no_style_check([H|T]) :- no_style_check(H), no_style_check(T).
 
 
-'$syntax_check_mode'(O,N) :- 
-	'$values'('$syntaxcheckflag',O,N).
-
 '$syntax_check_single_var'(O,N) :- 
-	'$values'('$syntaxchecksinglevar',O,N).
+	'$values'('$syntaxchecksinglevar',O,N),
+	'$checking_on'.
 
 '$syntax_check_discontiguous'(O,N) :- 
-	'$values'('$syntaxcheckdiscontiguous',O,N).
+	'$values'('$syntaxcheckdiscontiguous',O,N),
+	'$checking_on'.
 
 '$syntax_check_multiple'(O,N) :- 
-	'$values'('$syntaxcheckmultiple',O,N).
+	'$values'('$syntaxcheckmultiple',O,N),
+	'$checking_on'.
+
+%
+% cases where you need to check a clause
+%
+'$checking_on' :-
+	( 
+	  get_value('$syntaxchecksinglevar',on)
+	;
+	  get_value('$syntaxcheckdiscontiguous',on)
+	;
+	  get_value('$syntaxcheckmultiple',on)
+	), !,
+	set_value('$syntaxcheckflag',on).
+'$checking_on' :-
+	set_value('$syntaxcheckflag',off).
 
 % reset current state of style checker.
 '$init_style_check'(File) :-
@@ -166,24 +181,24 @@ no_style_check([H|T]) :- no_style_check(H), no_style_check(T).
 %
 '$singletons_in_clause'(T, VL, Sv) :-
         % first check which variables are not singleton
-	'$non_singletons_in_term'(T,[],V2L),
+	'$non_singletons_in_term'(T, [], V2L),
         % bound them
 	'$ground_vars'(V2L),
         % the remainder which do not start by _ are our target! 
 	'$sv_list'(VL, Sv).
 
 '$ground_vars'([]).
-'$ground_vars'(ground.V2L) :-
+'$ground_vars'([ground|V2L]) :-
 	'$ground_vars'(V2L).
 
 '$sv_list'([],[]).
-'$sv_list'([[95|_]._|T],L) :- !,
-	'$sv_list'(T,L).
 '$sv_list'([_|V].T,L) :- nonvar(V), !,
 	'$sv_list'(T,L).
-'$sv_list'([Name|_].T, Name.L) :-
+'$sv_list'([(X=_)|T], L) :-
+	atom_concat('_',_,X), !,
+	'$sv_list'(T,L).
+'$sv_list'([(Name=_)|T], [Name|L]) :-
 	'$sv_list'(T,L).
-	
 
 '$sv_warning'([], _) :- !.
 '$sv_warning'(SVs, T) :-

pl/flags.yap

@@ -503,18 +503,14 @@ yap_flag(debug,X) :-
 
 yap_flag(discontiguous_warnings,X) :-
 	var(X), !,
-	('$syntax_check_mode'(on,_), '$syntax_check_discontiguous'(on,_) ->
+	'$syntax_check_discontiguous'(on,_).
-	    X = on
-	;
-	    X = off
-	).
 yap_flag(discontiguous_warnings,X) :-
 	'$transl_to_on_off'(_,X), !,
-	(X = on -> 
+	(X == on -> 
-	    '$syntax_check_mode'(_,on),
+	    style_check(discontiguous)
-	    '$syntax_check_discontiguous'(_,on)
 	;
-	    '$syntax_check_discontiguous'(_,off)).
+	    style_check(-discontiguous)
+	).
 yap_flag(discontiguous_warnings,X) :-
 	'$do_error'(domain_error(flag_value,discontiguous_warnings+X),yap_flag(discontiguous_warnings,X)).
 
@@ -527,18 +523,14 @@ yap_flag(occurs_check,X) :-
 
 yap_flag(redefine_warnings,X) :-
 	var(X), !,
-	('$syntax_check_mode'(on,_), '$syntax_check_multiple'(on,_) ->
+	'$syntax_check_multiple'(X,X).
-	    X = on
-	;
-	    X = off
-	).
 yap_flag(redefine_warnings,X) :-
 	'$transl_to_on_off'(_,X), !,
-	(X = on -> 
+	(X == on -> 
-	    '$syntax_check_mode'(_,on),
+	    style_check(multiple)
-	    '$syntax_check_multiple'(_,on)
 	;
-	    '$syntax_check_multiple'(_,off)).
+	    style_check(-multiple)
+	).
 yap_flag(redefine_warnings,X) :-
 	'$do_error'(domain_error(flag_value,redefine_warnings+X),yap_flag(redefine_warnings,X)).
 
@@ -559,18 +551,14 @@ yap_flag(open_expands_filename,Expand) :-
 
 yap_flag(single_var_warnings,X) :-
 	var(X), !,
-	('$syntax_check_mode'(on,_), '$syntax_check_single_var'(on,_) ->
+	'$syntax_check_single_var'(X,X).
-	    X = on
-	;
-	    X = off
-	).
 yap_flag(single_var_warnings,X) :-
 	'$transl_to_on_off'(_,X), !,
-	(X = on -> 
+	(X == on ->
-	    '$syntax_check_mode'(_,on),
+	     style_check(single_var)
-	    '$syntax_check_single_var'(_,on)
 	;
-	    '$syntax_check_single_var'(_,off)).
+	     style_check(-single_var)
+	).
 yap_flag(single_var_warnings,X) :-
 	'$do_error'(domain_error(flag_value,single_var_warnings+X),yap_flag(single_var_warnings,X)).
 

pl/init.yap

@@ -177,7 +177,7 @@ yap_hacks:cut_by(CP) :- '$$cut_by'(CP).
 
 :- set_value('$user_module',user), '$protect'.
 
-:- style_check([]).
+:- style_check([-discontiguous,-multiple,-single_var]).
 
 %
 % moved this to init_gc in gc.c to separate the alpha