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

ISO: remove nonstandard operator meta_predicate.

Browse Source 
Use functional notation instead for declarations.

This addresses #2822.
This commit is contained in:
Markus Triska
2025-08-02 10:08:27 +02:00
parent a43bac8fd8
commit a8da2b6a99
19 changed files with 142 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib/builtins.pl
View File

@@ -113,7 +113,7 @@ call(_, _, _, _, _, _, _, _).
call(_, _, _, _, _, _, _, _, _).
:- meta_predicate catch(0, ?, 0).
:- meta_predicate(catch(0, ?, 0)).
% flags.
@@ -248,7 +248,7 @@ flag_domain_error(Flag, Value) :-
fail :- '$fail'.
:- meta_predicate \+(0).
:- meta_predicate(\+(0)).
%% \+(Goal)
%
@@ -263,7 +263,7 @@ X \= X :- !, '$fail'.
_ \= _.
:- meta_predicate once(0).
:- meta_predicate(once(0)).
%% once(Goal)
%
@@ -278,11 +278,11 @@ repeat.
repeat :- repeat.
:- meta_predicate ','(0,0).
:- meta_predicate(','(0,0)).
:- meta_predicate ;(0,0).
:- meta_predicate(;(0,0)).
:- meta_predicate ->(0,0).
:- meta_predicate(->(0,0)).
%% ->(G1, G2)
%
@@ -553,7 +553,7 @@ get_args([Arg|Args], Func, I0, N) :-
get_args(Args, Func, I1, N).
:- meta_predicate parse_options_list(?, 2, ?, ?, ?).
:- meta_predicate(parse_options_list(?, 2, ?, ?, ?)).
parse_options_list(Options, Selector, DefaultPairs, OptionValues, Stub) :-
'$skip_max_list'(_, _, Options, Tail),
@@ -816,7 +816,7 @@ catch(G,C,R) :-
'$get_current_block'(Bb),
catch(G,C,R,Bb).
:- meta_predicate catch(0, ?, 0, ?).
:- meta_predicate(catch(0, ?, 0, ?)).
:- non_counted_backtracking catch/4.
@@ -884,7 +884,7 @@ throw(Ball) :-
truncate_lh_to(LhLength) :- '$truncate_lh_to'(LhLength).
:- meta_predicate findall(?, 0, ?).
:- meta_predicate(findall(?, 0, ?)).
:- non_counted_backtracking findall_cleanup/2.
@@ -927,7 +927,7 @@ findall(Template, Goal, Solutions) :-
'$get_lh_from_offset_diff'(LhOffset, Solutions0, Solutions1).
:- meta_predicate findall(?, 0, ?, ?).
:- meta_predicate(findall(?, 0, ?, ?)).
:- non_counted_backtracking findall/4.
@@ -1045,7 +1045,7 @@ findall_with_existential(Template, Goal, PairedSolutions, Witnesses0, Witnesses)
).
:- meta_predicate bagof(?, 0, ?).
:- meta_predicate(bagof(?, 0, ?)).
:- non_counted_backtracking bagof/3.
@@ -1091,7 +1091,7 @@ iterate_variants_and_sort([_|GroupSolutions], Ws, Solution) :-
iterate_variants_and_sort(GroupSolutions, Ws, Solution).
:- meta_predicate setof(?, 0, ?).
:- meta_predicate(setof(?, 0, ?)).
:- non_counted_backtracking setof/3.
@@ -1168,7 +1168,7 @@ clause(H, B) :-
).
:- meta_predicate asserta(:).
:- meta_predicate(asserta(:)).
%% asserta(Clause).
%
@@ -1184,7 +1184,7 @@ asserta_(Module, (Head :- Body)) :-
asserta_(Module, Fact) :-
'$asserta'(Module, Fact, true).
:- meta_predicate assertz(:).
:- meta_predicate(assertz(:)).
%% assertz(Clause).
%
@@ -1201,7 +1201,7 @@ assertz_(Module, Fact) :-
'$assertz'(Module, Fact, true).
:- meta_predicate retract(:).
:- meta_predicate(retract(:)).
%% retract(Clause)
%
@@ -1278,7 +1278,7 @@ retract_module_clause(Head, Body, Module) :-
; throw(error(type_error(callable, Head), retract/1))
).
:- meta_predicate retractall(:).
:- meta_predicate(retractall(:)).
%% retractall(Head)
%
@@ -1318,7 +1318,7 @@ module_abolish(Pred, Module) :-
; throw(error(type_error(predicate_indicator, Module:Pred), abolish/1))
).
:- meta_predicate abolish(:).
:- meta_predicate(abolish(:)).
%% abolish(Pred).
%