diogo
/
yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ISO: conforming type errors for setof/3 etc ulrich neumerkel patch

This commit is contained in:
Vitor Santos Costa 2010-11-21 21:49:13 +00:00
parent bb570108de
commit 1b36c79733
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pl/setof.yap
View File

@ -32,7 +32,11 @@ _^Goal :-
findall(Template, Generator, Answers) :- 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). '$findall'(Template, Generator, [], Answers).
@ -76,7 +80,11 @@ findall(Template, Generator, Answers, SoFar) :-
% This is the setof predicate % This is the setof predicate
setof(Template, Generator, Set) :- 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), '$bagof'(Template, Generator, Bag),
'$sort'(Bag, Set). '$sort'(Bag, Set).
@ -87,10 +95,14 @@ setof(Template, Generator, Set) :-
% of these variables % of these variables
bagof(Template, Generator, Bag) :- 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).
'$bagof'(Template, Generator, Bag) :- '$bagof'(Template, Generator, Bag) :-
'$check_list_for_bags'(Bag, bagof(Template, Generator, Bag)),
'$variables_in_term'(Template, [], TemplateV), '$variables_in_term'(Template, [], TemplateV),
'$excess_vars'(Generator, StrippedGenerator, TemplateV, [], FreeVars), '$excess_vars'(Generator, StrippedGenerator, TemplateV, [], FreeVars),
( FreeVars \== [] -> ( FreeVars \== [] ->
@ -223,10 +235,8 @@ all(T,G,S) :-
'$$split'([T1|Tn],T,X,S1,[T1|S2]) :- '$$split'(Tn,T,X,S1,S2). '$$split'([T1|Tn],T,X,S1,[T1|S2]) :- '$$split'(Tn,T,X,S1,S2).
'$check_list_for_bags'(V, _) :- var(V), !. '$partial_list_or_list'(V) :- var(V), !.
'$check_list_for_bags'([], _) :- !. '$partial_list_or_list'([]) :- !.
'$check_list_for_bags'([_|B], T) :- !, '$partial_list_or_list'([_|B]) :- !
'$check_list_for_bags'(B,T). '$partial_list_or_list'(B).
'$check_list_for_bags'(S, T) :-
'$do_error'(type_error(list,S),T).