From 1b36c797331932ee8161a09609b33f7e53ae2424 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Sun, 21 Nov 2010 21:49:13 +0000
Subject: [PATCH] ISO: conforming type errors for setof/3 etc ulrich neumerkel
 patch

---
 pl/setof.yap | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/pl/setof.yap b/pl/setof.yap
index 5049a2328..198c9d55f 100644
--- a/pl/setof.yap
+++ b/pl/setof.yap
@@ -32,7 +32,11 @@ _^Goal :-
 
 
 findall(Template, Generator, Answers) :-
-	'$check_list_for_bags'(Answers, findall(Template, Generator, Answers)),
+	( '$partial_list_or_list'(Answers) ->
+		true
+	;
+		'$do_error'(type_error(list,Answers), findall(Template, Generator, Answers))
+	),
 	'$findall'(Template, Generator, [], Answers).
 
 
@@ -76,7 +80,11 @@ findall(Template, Generator, Answers, SoFar) :-
 % This is the setof predicate
 
 setof(Template, Generator, Set) :-
-	'$check_list_for_bags'(Set, setof(Template, Generator, Set)),
+	( '$partial_list_or_list'(Set) ->
+		true
+	;
+		'$do_error'(type_error(list,Set), setof(Template, Generator, Set))
+	),
 	'$bagof'(Template, Generator, Bag),
 	'$sort'(Bag, Set).
 
@@ -87,10 +95,14 @@ setof(Template, Generator, Set) :-
 % of these variables
 
 bagof(Template, Generator, Bag) :-
+	( '$partial_list_or_list'(Bag) ->
+		true
+	;
+		'$do_error'(type_error(list,Bag), bagof(Template, Generator, Bag))
+	),
 	'$bagof'(Template, Generator, Bag).
-	
+
 '$bagof'(Template, Generator, Bag) :-
-	'$check_list_for_bags'(Bag, bagof(Template, Generator, Bag)),
 	'$variables_in_term'(Template, [], TemplateV),
 	'$excess_vars'(Generator, StrippedGenerator, TemplateV, [], FreeVars),
 	( FreeVars \== [] ->
@@ -223,10 +235,8 @@ all(T,G,S) :-
 '$$split'([T1|Tn],T,X,S1,[T1|S2]) :- '$$split'(Tn,T,X,S1,S2).
 
 
-'$check_list_for_bags'(V, _) :- var(V), !.
-'$check_list_for_bags'([], _) :- !.
-'$check_list_for_bags'([_|B], T) :- !,
-	'$check_list_for_bags'(B,T).
-'$check_list_for_bags'(S, T) :-
-	'$do_error'(type_error(list,S),T).
+'$partial_list_or_list'(V) :- var(V), !.
+'$partial_list_or_list'([]) :- !.
+'$partial_list_or_list'([_|B]) :- !
+	'$partial_list_or_list'(B).