Adapt original reif.pl

Author: hurufu

src/lib/reif.pl

@@ -11,7 +11,7 @@
      tfilter/3,
      tpartition/4
 %
-    ], [hidden(true)]).
+    ]).
 %
 %
 %
@@ -23,16 +23,7 @@
 U. Neumerkel and S. Kral. https://arxiv.org/abs/1607.01590 [cs.PL]. July 2016.
 */
 
-
-:- meta_predicate
-    if_(1, 0, 0),
-    cond_t(1, 0, ?),
-    tfilter(2, ?, ?),
-    tpartition(2, ?, ?, ?),
-    ','(1, 1, ?),
-    ;(1, 1, ?),
-    tmember(2, ?),
-    tmember_t(2, ?, ?).
+:- use_module(library(dif)).
 
 :- op(900, fy, [$]).
 
@@ -102,7 +93,7 @@
 */
 
 %
-goal_expansion(if_(If_1, Then_0, Else_0), _L0, _M, G_0, []) :-
+user:goal_expansion(if_(If_1, Then_0, Else_0), G_0) :-
    ugoal_expansion(if_(If_1, Then_0, Else_0), G_0).
 
 %
@@ -117,10 +108,7 @@
 %
 %
 ugoal_expansion(if_(If_1, Then_0, Else_0), Goal_0) :-
-   subsumes_term(M:(X=Y), If_1),
-   M:(X=Y) = If_1,
-   atom(M),
-   ( M == reif -> true ; predicate_property(M: =(_,_,_),imported_from(reif)) ),
+    nonvar(If_1), If_1 = (X = Y),
    goal_expanded(call(Then_0), Thenx_0),
    goal_expanded(call(Else_0), Elsex_0),
    !,
@@ -130,20 +118,27 @@
       ; X = Y,    Thenx_0
       ; dif(X,Y), Elsex_0
       ).
+ugoal_expansion(if_(If_1, Then_0, Else_0), Goal) :-
+   nonvar(If_1), If_1 = dif(X, Y),
+   goal_expanded(call(Then_0), Thenx_0),
+   goal_expanded(call(Else_0), Elsex_0),
+   !,
+   Goal =
+      ( X \= Y -> Thenx_0
+      ; X == Y -> Elsex_0
+      ; X = Y,    Elsex_0
+      ; dif(X,Y), Thenx_0
+      ).
 % if_((A_1;B_1), Then_0, Else_0)
 % => if_(A_1, Then_0, if_(B_1, Then_0, Else_0))
 ugoal_expansion(if_(If_1, Then_0, Else_0), Goal) :-
-   subsumes_term(M:(A_1;B_1), If_1),
-   M:(A_1;B_1) = If_1,
-   atom(M),
-   ( M == reif -> true ; predicate_property(M:;(_,_,_),imported_from(reif)) ),
+   subsumes_term((A_1;B_1), If_1),
+   (A_1;B_1) = If_1,
    !,
    Goal = if_(A_1, Then_0, if_(B_1, Then_0, Else_0)).
 ugoal_expansion(if_(If_1, Then_0, Else_0), Goal_0) :-
-   subsumes_term(M:(A_1,B_1), If_1),
-   M:(A_1,B_1) = If_1,
-   atom(M),
-   ( M == reif -> true ; predicate_property(M:','(_,_,_),imported_from(reif)) ),
+   subsumes_term((A_1,B_1), If_1),
+   (A_1,B_1) = If_1,
    !,
    Goal_0 = if_(A_1, if_(B_1, Then_0, Else_0), Else_0).
 ugoal_expansion(if_(If_1, Then_0, Else_0), Goal_0) :-
@@ -154,10 +149,8 @@
       (  Ifx_0,
          (  T == true -> Thenx_0
          ;  T == false -> Elsex_0
-         ;  nonvar(T) -> throw(error(type_error(boolean,T),
-                               type_error(call(If_1,T),2,boolean,T)))
-         ;  throw(error(instantiation_error,
-                               instantiation_error(call(If_1,T),2)))
+         ;  nonvar(T) -> throw(error(type_error(boolean,T),_))
+         ;  throw(error(instantiation_error,_))
          )
       ).
 %
@@ -216,17 +209,19 @@
 %
 %
 %
+:- meta_predicate(if_(1, 0, 0)).
 
 if_(If_1, Then_0, Else_0) :-
    call(If_1, T),
    (  T == true -> Then_0
    ;  T == false -> Else_0
-   ;  nonvar(T) -> throw(error(type_error(boolean,T),
-                               type_error(call(If_1,T),2,boolean,T)))
-   ;  throw(error(instantiation_error,instantiation_error(call(If_1,T),2)))
+   ;  nonvar(T) -> throw(error(type_error(boolean,T),_))
+   ;  throw(error(instantiation_error,_))
    ).
 
 
+:- meta_predicate(tfilter(2, ?, ?)).
+
 tfilter(C_2, Es, Fs) :-
    i_tfilter(Es, C_2, Fs).
 
@@ -235,6 +230,8 @@
    if_(call(C_2, E), Fs0 = [E|Fs], Fs0 = Fs),
    i_tfilter(Es, C_2, Fs).
 
+:- meta_predicate(tpartition(2, ?, ?, ?)).
+
 tpartition(P_2, Xs, Ts, Fs) :-
    i_tpartition(Xs, P_2, Ts, Fs).
 
@@ -260,12 +257,18 @@
 non(true, false).
 non(false, true).
 
+:- meta_predicate(','(1, 1, ?)).
+
 ','(A_1, B_1, T) :-
    if_(A_1, call(B_1, T), T = false).
 
+:- meta_predicate(;(1, 1, ?)).
+
 ;(A_1, B_1, T) :-
    if_(A_1, T = true, call(B_1, T)).
 
+:- meta_predicate(cond_t(1, 0, ?)).
+
 cond_t(If_1, Then_0, T) :-
    if_(If_1, ( Then_0, T = true ), T = false ).
 
@@ -276,9 +279,13 @@
 i_memberd_t([X|Xs], E, T) :-
    if_( X = E, T = true, i_memberd_t(Xs, E, T) ).
 
+:- meta_predicate(tmember(2, ?)).
+
 tmember(P_2, [X|Xs]) :-
    if_( call(P_2, X), true, tmember(P_2, Xs) ).
 
+:- meta_predicate(tmember_t(2, ?, ?)).
+
 tmember_t(_P_2, [], false).
 tmember_t(P_2, [X|Xs], T) :-
    if_( call(P_2, X), T = true, tmember_t(P_2, Xs, T) ).