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

support module resolution in current_predicate/1 (#1817)

Browse Source
This commit is contained in:
Mark
2023-06-27 11:08:29 -06:00
parent ce890799bc
commit b593fffc7d
4 changed files with 57 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/builtins.pl
View File

@@ -1254,7 +1254,13 @@ current_predicate(Pred) :-
( var(Pred) ->
'$get_db_refs'(_, _, PIs),
lists:member(Pred, PIs)
; Pred = Name/Arity ->
; '$strip_module'(Pred, Module, UnqualifiedPred),
( var(Module),
\+ functor(Pred, (:), 2)
; atom(Module)
),
nonvar(UnqualifiedPred),
UnqualifiedPred = Name/Arity ->
( ( nonvar(Name), \+ atom(Name)
; nonvar(Arity), \+ integer(Arity)
; integer(Arity), Arity < 0
@@ -1262,9 +1268,9 @@ current_predicate(Pred) :-
throw(error(type_error(predicate_indicator, Pred), current_predicate/1))
; nonvar(Name),
nonvar(Arity) ->
'$lookup_db_ref'(Name, Arity)
; '$get_db_refs'(Name, Arity, PIs),
lists:member(Pred, PIs)
'$lookup_db_ref'(Module, Name, Arity)
; '$get_db_refs'(Module, Name, Arity, PIs),
lists:member(UnqualifiedPred, PIs)
)
; throw(error(type_error(predicate_indicator, Pred), current_predicate/1))
).