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

speedup current_pred

Browse Source 
fixes from David Powerswq
This commit is contained in:
Vítor Santos Costa 2010-09-28 01:01:37 +01:00
parent 13130df3d9
commit 6d4d1b1a3a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pl/preds.yap
View File

@ -234,7 +234,7 @@ assertz_static(C) :-
'$erase_all_mf_dynamic'(Na,A,M) :- '$erase_all_mf_dynamic'(Na,A,M) :-
get_value('$consulting_file',F), get_value('$consulting_file',F),
'$recorded'('$multifile_dynamic'(_,_,_), '$mf'(Na,A,M,F,R), R1), recorded('$multifile_dynamic'(_,_,_), '$mf'(Na,A,M,F,R), R1),
erase(R1), erase(R1),
erase(R), erase(R),
fail. fail.
@ -649,12 +649,6 @@ abolish(X) :-
'$undefined'(G, Module), '$undefined'(G, Module),
functor(G,Name,Arity), functor(G,Name,Arity),
print_message(warning,no_match(abolish(Module:Name/Arity))). print_message(warning,no_match(abolish(Module:Name/Arity))).
% I cannot allow modifying static procedures in YAPOR
% this code has to be here because of abolish/2
% '$abolishs'(G, Module) :-
% '$has_yap_or', !,
% functor(G,A,N),
% '$do_error'(permission_error(modify,static_procedure,A/N),abolish(Module:G)).
'$abolishs'(G, M) :- '$abolishs'(G, M) :-
'$is_multifile'(G,M), !, '$is_multifile'(G,M), !,
functor(G,Name,Arity), functor(G,Name,Arity),
@ -927,7 +921,8 @@ current_predicate(A,T) :-
current_predicate(A) :- current_predicate(A) :-
'$current_predicate_inside'(A). '$current_predicate_inside'(A).
'$current_predicate_inside'(F) :- var(F), !, % only for the predicate '$current_predicate_inside'(F) :-
var(F), !, % only for the predicate
'$current_module'(M), '$current_module'(M),
'$current_predicate3'(M,F). '$current_predicate3'(M,F).
'$current_predicate_inside'(M:F) :- % module specified '$current_predicate_inside'(M:F) :- % module specified
@ -955,7 +950,14 @@ system_predicate(P) :-
'$ifunctor'(T,A,Arity), '$ifunctor'(T,A,Arity),
'$pred_exists'(T,M). '$pred_exists'(T,M).
'$current_predicate3'(M,A/Arity) :- nonvar(A), nonvar(Arity), !, '$current_predicate3'(M,A/Arity) :-
nonvar(M),
nonvar(A),
nonvar(Arity), !,
'$ifunctor'(Pred,A,Arity),
'$pred_exists'(Pred,M).
'$current_predicate3'(M,A/Arity) :-
nonvar(A), nonvar(Arity), !,
( (
'$current_predicate'(M,A,Arity) '$current_predicate'(M,A,Arity)
-> ->