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

modify rightmost_power/2 to ignore module qualification on (^)/2 (#794)

Browse Source
This commit is contained in:
Mark Thom
2021-02-04 20:51:55 -07:00
parent 75a52f032b
commit 222be9cf6c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/builtins.pl
View File

@@ -665,8 +665,11 @@ iterate_variants([V-Solution|GroupSolutions], V, Solution) :-
iterate_variants([_|GroupSolutions], Ws, Solution) :- iterate_variants([_|GroupSolutions], Ws, Solution) :-
iterate_variants(GroupSolutions, Ws, Solution). iterate_variants(GroupSolutions, Ws, Solution).
rightmost_power(Term, FinalTerm, Xs) :- rightmost_power(Term, FinalTerm, Xs) :-
( Term = X ^ Y ( ( Term = X ^ Y
; Term = _ : X ^ Y
)
-> ( var(Y) -> FinalTerm = Y, Xs = [X] -> ( var(Y) -> FinalTerm = Y, Xs = [X]
; Xs = [X | Xss], rightmost_power(Y, FinalTerm, Xss) ; Xs = [X | Xss], rightmost_power(Y, FinalTerm, Xss)
) )
@@ -674,11 +677,11 @@ rightmost_power(Term, FinalTerm, Xs) :-
). ).
% :- meta_predicate findall_with_existential(?, 0, ?, ?, ?).
findall_with_existential(Template, Goal, PairedSolutions, Witnesses0, Witnesses) :- findall_with_existential(Template, Goal, PairedSolutions, Witnesses0, Witnesses) :-
( nonvar(Goal), ( nonvar(Goal),
Goal = _ ^ _ -> ( Goal = _ ^ _
; Goal = _ : (_ ^ _)
) ->
rightmost_power(Goal, Goal1, ExistentialVars0), rightmost_power(Goal, Goal1, ExistentialVars0),
term_variables(ExistentialVars0, ExistentialVars), term_variables(ExistentialVars0, ExistentialVars),
sort(Witnesses0, Witnesses1), sort(Witnesses0, Witnesses1),