rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #420 from triska/master

Browse Source 
correct verify_attributes/3 for variables that have no CLP(ℤ) attribute attached (#373)
This commit is contained in:
Mark Thom
2020-04-30 13:32:21 -03:00
committed by GitHub
parent f7b401b9b6 a39f4b4487
commit a821daadd3
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/prolog/lib/clpz.pl
View File

@@ -7371,7 +7371,8 @@ goals_entail(Goals, E) :-
verify_attributes(Var, Other, Gs) :- verify_attributes(Var, Other, Gs) :-
% portray_clause(Var = Other), % portray_clause(Var = Other),
( get_attr(Var, clpz, clpz_attr(_,_,_,Dom,Ps,Q)) -> ( get_atts(Var, clpz(CLPZ)) ->
CLPZ = clpz_attr(_,_,_,Dom,Ps,Q),
( nonvar(Other) -> ( nonvar(Other) ->
( integer(Other) -> true ( integer(Other) -> true
; type_error(integer, Other) ; type_error(integer, Other)
@@ -7379,14 +7380,17 @@ verify_attributes(Var, Other, Gs) :-
domain_contains(Dom, Other), domain_contains(Dom, Other),
phrase(trigger_props(Ps), [Q], [_]), phrase(trigger_props(Ps), [Q], [_]),
Gs = [phrase(do_queue, [Q], _)] Gs = [phrase(do_queue, [Q], _)]
; fd_get(Other, OD, OPs), ; ( get_atts(Other, clpz(clpz_attr(_,_,_,OD,OPs,_))) ->
domains_intersection(OD, Dom, Dom1), domains_intersection(OD, Dom, Dom1),
append_propagators(Ps, OPs, Ps1), append_propagators(Ps, OPs, Ps1),
new_queue(Q0), new_queue(Q0),
variables_same_queue([Var,Other]), variables_same_queue([Var,Other]),
phrase((fd_put(Other,Dom1,Ps1), phrase((fd_put(Other,Dom1,Ps1),
trigger_props(Ps1)), [Q0], _), trigger_props(Ps1)), [Q0], _),
Gs = [phrase(do_queue, [Q0], _)] Gs = [phrase(do_queue, [Q0], _)]
; put_atts(Other, clpz(CLPZ)),
Gs = []
)
) )
; Gs = [] ; Gs = []
). ).