FIXED: check_predicate_options/0: avoid several false warnings.

SWI-Prolog · Sep 6, 2023 · fb7f860 · fb7f860
1 parent 7a1af96
commit fb7f860
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/boot/predopts.pl b/boot/predopts.pl
@@ -92,6 +92,7 @@
       functor(THead, Name, Arity),
       Clause = ('$pred_option'(Head, pass_to(PI0, Arg), Opt, Seen) :-
                   \+ memberchk(PI-Arg, Seen),
+                  ignore(predicate_property(M:THead, _)),
                   predicate_options:pred_option(TM:THead, Opt, [PI-Arg|Seen]))
     },
     [ M:Clause ].

diff --git a/library/predicate_options.pl b/library/predicate_options.pl
@@ -303,8 +303,8 @@
     ).
 
 
-pred_option(M:Head, Option) :-
-    pred_option(M:Head, Option, []).
+pred_option(Head, Option) :-
+    pred_option(Head, Option, []).
 
 pred_option(M:Head, Option, Seen) :-
     (   has_static_option_decl(M),
@@ -340,13 +340,18 @@
 system:predicate_option_type(callable+_N, Arg) :-
     !,
     must_be(callable, Arg).
+system:predicate_option_type(list, Arg) :-
+    !,
+    must_be(list_or_partial_list, Arg).
+system:predicate_option_type(list(Type), Arg) :-
+    !,
+    must_be(list_or_partial_list(Type), Arg).
 system:predicate_option_type(Type, Arg) :-
     must_be(Type, Arg).
 
-system:predicate_option_mode(Mode, Arg) :-
+system:predicate_option_mode(_Mode, Arg) :-
     var(Arg),
-    !,
-    add_attr(Arg, option_mode(Mode)).
+    !.
 system:predicate_option_mode(Mode, Arg) :-
     check_mode(Mode, Arg).
 
@@ -679,6 +684,10 @@
     !,
     check_body(A, M, PA, Action),
     check_body(B, M, PB, Action).
+check_body((A;B), M, term_position(_,_,_,_,[PA,PB]), Action) :-
+    !,
+    \+ \+ check_body(A, M, PA, Action),
+    \+ \+ check_body(B, M, PB, Action).
 check_body(A=B, _, _, _) :-             % partial evaluation
     unify_with_occurs_check(A,B),
     !.