diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

current_predicate & abolish (Paulo Moura's tests)

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-11-05 17:26:50 +00:00
parent e162ec9ef9
commit 4dfcdd4e87
1 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pl/preds.yap
View File

@ -389,7 +389,7 @@ abolish(X0) :-
'$do_error'(type_error(atom,M), Msg). '$do_error'(type_error(atom,M), Msg).
'$old_abolish'(V,M) :- var(V), !, '$old_abolish'(V,M) :- var(V), !,
( current_prolog_flag(language, sicstus) -> ( true -> % current_prolog_flag(language, sicstus) ->
'$do_error'(instantiation_error,abolish(M:V)) '$do_error'(instantiation_error,abolish(M:V))
; ;
'$abolish_all_old'(M) '$abolish_all_old'(M)
@ -685,19 +685,44 @@ system_predicate(P) :-
_Na_ is the name of the predicate, and _Ar_ its arity. _Na_ is the name of the predicate, and _Ar_ its arity.
*/ */
current_predicate(F0) :- current_predicate(F0) :-
'$yap_strip_module'(F0, M, AN), '$yap_strip_module'(F0, M, F),
( AN = A/N (var(F) ->
-> true
current_predicate(A, M:S),
functor( S, A, N)
; ;
AN == A//N (
-> functor(F,AN,2)
current_predicate(A, M:S), ->
Ar2 is N+2, true
functor( S, A, Ar2) ;
'$do_error'(type_error(predicate_indicator,F0),
current_predicate(F0))
),
arg(1,F,A),
(atom(A) -> true ;
var(A) -> true ;
'$do_error'(type_error(predicate_indicator,F0),current_predicate(F0))
),
arg(2,F,N),
(integer(N) -> true ;
var(N) -> true ;
'$do_error'(type_error(predicate_indicator,F0),current_predicate(F0))
),
( AN == '/'
->
current_predicate(A, M:S),
functor( S, A, N)
;
AN == '//'
->
current_predicate(A, M:S),
Ar2 is N+2,
functor( S, A, Ar2)
;
'$do_error'(type_error(predicate_indicator,F0),current_predicate(F0))
)
). ).
'$imported_predicate'(A, ImportingMod, A/Arity, G, Flags) :- '$imported_predicate'(A, ImportingMod, A/Arity, G, Flags) :-
'$get_undefined_pred'(G, ImportingMod, G0, ExportingMod), '$get_undefined_pred'(G, ImportingMod, G0, ExportingMod),
functor(G, A, Arity), functor(G, A, Arity),