]> Repositorios git - scryer-prolog.git/commitdiff
tuples_in/2 now works
authorMarkus Triska <[email protected]>
Wed, 8 Apr 2020 15:49:06 +0000 (17:49 +0200)
committerMarkus Triska <[email protected]>
Wed, 8 Apr 2020 15:49:06 +0000 (17:49 +0200)
src/prolog/lib/clpz.pl

index df5ade2d4733e0cb6658e00c63b893aab7fb5048..458c5d21d8764691d04786af4b3b9ab7662a6e51 100644 (file)
@@ -4295,12 +4295,14 @@ tuples_in(Tuples, Relation) :-
 relation_tuple(Relation, Tuple) :-
         relation_unifiable(Relation, Tuple, Us, _, _),
         (   ground(Tuple) -> memberchk(Tuple, Relation)
-        ;   tuple_domain(Tuple, Us),
+        ;   phrase(tuple_domain(Tuple, Us), _),
             (   Tuple = [_,_|_] -> tuple_freeze(Tuple, Us)
             ;   true
             )
         ).
 
+list_first_rest([L|Ls], L, Ls).
+
 tuple_domain([], _) --> [].
 tuple_domain([T|Ts], Relation0) -->
         { maplist(list_first_rest, Relation0, Firsts, Relation1) },