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

merge

Browse Source
This commit is contained in:
Mark Thom
2020-05-03 23:36:26 -06:00
parent a49230c0e1 0111db6744
commit 407094cdcb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/prolog/toplevel.pl
View File

@@ -295,7 +295,7 @@ gather_query_vars([], []).
is_a_different_variable([_ = Binding | Pairs], Value) :- is_a_different_variable([_ = Binding | Pairs], Value) :-
( Value == Binding, ! ( Value == Binding, !
; is_a_different_variable(Pairs, Var) ; is_a_different_variable(Pairs, Value)
). ).
eq_member(X, [Y|_]) :- X == Y, !. eq_member(X, [Y|_]) :- X == Y, !.
@@ -304,8 +304,8 @@ eq_member(X, [_|Ys]) :- eq_member(X, Ys).
gather_equations([], _, Goals, Goals). gather_equations([], _, Goals, Goals).
gather_equations([Var = Value | Pairs], OrigVarList, Goals, Goals1) :- gather_equations([Var = Value | Pairs], OrigVarList, Goals, Goals1) :-
( var(Value) -> ( var(Value) ->
eq_member(Value, OrigVarList), ( eq_member(Value, OrigVarList),
( ( Pairs == [], NewPairs = [] ( Pairs == [], NewPairs = []
; ( select((OtherVar = OtherValue), Pairs, NewPairs), ; ( select((OtherVar = OtherValue), Pairs, NewPairs),
Value == OtherValue, Var \== OtherVar Value == OtherValue, Var \== OtherVar
) )