From 21e5b0ab527169ff5b4cefa3bfdb982de97789dd Mon Sep 17 00:00:00 2001 From: Markus Triska Date: Sat, 20 Nov 2021 22:37:31 +0100 Subject: [PATCH 1/7] FIXED: meta_predicate/1 declaration for tpartition/4. This addresses #1101. --- src/lib/reif.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/reif.pl b/src/lib/reif.pl index b8d4bbaa..07992244 100644 --- a/src/lib/reif.pl +++ b/src/lib/reif.pl @@ -38,7 +38,7 @@ i_tfilter([E|Es], C_2, Fs0) :- if_(call(C_2, E), Fs0 = [E|Fs], Fs0 = Fs), i_tfilter(Es, C_2, Fs). -:- meta_predicate tpartition(1, ?, ?). +:- meta_predicate(tpartition(2, ?, ?, ?)). tpartition(P_2, Xs, Ts, Fs) :- i_tpartition(Xs, P_2, Ts, Fs). From 2be8ed886b1478cc7a3d8b09b43edcde38d3f339 Mon Sep 17 00:00:00 2001 From: Markus Triska Date: Sat, 20 Nov 2021 22:37:59 +0100 Subject: [PATCH 2/7] FIXED: meta_predicate/1 declaration for tmember/2. --- src/lib/reif.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/reif.pl b/src/lib/reif.pl index 07992244..f278e20b 100644 --- a/src/lib/reif.pl +++ b/src/lib/reif.pl @@ -72,7 +72,7 @@ i_memberd_t([], _, false). i_memberd_t([X|Xs], E, T) :- if_( X = E, T = true, i_memberd_t(Xs, E, T) ). -:- meta_predicate tmember(1, ?). +:- meta_predicate(tmember(2, ?)). tmember(P_2, [X|Xs]) :- if_( call(P_2, X), true, tmember(P_2, Xs) ). From cf77f2998808f4ef52c1d0e580a1714f8074d955 Mon Sep 17 00:00:00 2001 From: Markus Triska Date: Sat, 20 Nov 2021 22:38:27 +0100 Subject: [PATCH 3/7] FIXED: meta_predicate/1 declaration for tmember_t/3. --- src/lib/reif.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/reif.pl b/src/lib/reif.pl index f278e20b..af6713e9 100644 --- a/src/lib/reif.pl +++ b/src/lib/reif.pl @@ -77,7 +77,7 @@ i_memberd_t([X|Xs], E, T) :- tmember(P_2, [X|Xs]) :- if_( call(P_2, X), true, tmember(P_2, Xs) ). -:- meta_predicate tmember_t(1, ?). +:- meta_predicate(tmember_t(2, ?, ?)). tmember_t(P_2, [X|Xs], T) :- if_( call(P_2, X), T = true, tmember_t(P_2, Xs, T) ). From e05dd5ebb527ad965f6b92a9b63b6dd30b202a31 Mon Sep 17 00:00:00 2001 From: Markus Triska Date: Sat, 20 Nov 2021 22:39:38 +0100 Subject: [PATCH 4/7] FIXED: meta_predicate/1 declaration for tfilter/3. --- src/lib/reif.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/reif.pl b/src/lib/reif.pl index af6713e9..a032af32 100644 --- a/src/lib/reif.pl +++ b/src/lib/reif.pl @@ -28,7 +28,7 @@ dif(X, Y, T) :- non(true, false). non(false, true). -:- meta_predicate tfilter(1, ?, ?). +:- meta_predicate tfilter(2, ?, ?). tfilter(C_2, Es, Fs) :- i_tfilter(Es, C_2, Fs). From 6610ba67c449f8b712cc63e4a4f12601b5cbe239 Mon Sep 17 00:00:00 2001 From: Markus Triska Date: Sat, 20 Nov 2021 22:43:07 +0100 Subject: [PATCH 5/7] FIXED: meta_predicate/1 declaration of (',')/3 and (;)/3. --- src/lib/reif.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/reif.pl b/src/lib/reif.pl index a032af32..f3bc72b3 100644 --- a/src/lib/reif.pl +++ b/src/lib/reif.pl @@ -4,7 +4,7 @@ :- use_module(library(dif)). -:- meta_predicate if_(1, 0, 0). +:- meta_predicate(if_(1, 0, 0)). if_(If_1, Then_0, Else_0) :- call(If_1, T), @@ -50,12 +50,12 @@ i_tpartition([X|Xs], P_2, Ts0, Fs0) :- , ( Fs0 = [X|Fs], Ts0 = Ts ) ), i_tpartition(Xs, P_2, Ts, Fs). -:- meta_predicate ','(0, 0, ?). +:- meta_predicate(','(1, 1, ?)). ','(A_1, B_1, T) :- if_(A_1, call(B_1, T), T = false). -:- meta_predicate ';'(0, 0, ?). +:- meta_predicate(';'(1, 1, ?)). ';'(A_1, B_1, T) :- if_(A_1, T = true, call(B_1, T)). From 66becaf91c56deaa52724ea8e39aa724d23cc1de Mon Sep 17 00:00:00 2001 From: Markus Triska Date: Sat, 20 Nov 2021 22:43:33 +0100 Subject: [PATCH 6/7] FIXED: meta_predicate/1 declaration of cond_t/3. --- src/lib/reif.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/reif.pl b/src/lib/reif.pl index f3bc72b3..169ecb2d 100644 --- a/src/lib/reif.pl +++ b/src/lib/reif.pl @@ -60,7 +60,7 @@ i_tpartition([X|Xs], P_2, Ts0, Fs0) :- ';'(A_1, B_1, T) :- if_(A_1, T = true, call(B_1, T)). -:- meta_predicate cond_t(0, 0, ?). +:- meta_predicate(cond_t(1, 0, ?)). cond_t(If_1, Then_0, T) :- if_(If_1, ( Then_0, T = true ), T = false ). From faf74519dc8d23007d623f9bb80e0a86f045250b Mon Sep 17 00:00:00 2001 From: Markus Triska Date: Sat, 20 Nov 2021 22:43:53 +0100 Subject: [PATCH 7/7] use round brackets for meta_predicate/1 declaration --- src/lib/reif.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/reif.pl b/src/lib/reif.pl index 169ecb2d..a1d31419 100644 --- a/src/lib/reif.pl +++ b/src/lib/reif.pl @@ -28,7 +28,7 @@ dif(X, Y, T) :- non(true, false). non(false, true). -:- meta_predicate tfilter(2, ?, ?). +:- meta_predicate(tfilter(2, ?, ?)). tfilter(C_2, Es, Fs) :- i_tfilter(Es, C_2, Fs).