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

fix meta-call on system predicates bug

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1181 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2004-11-22 05:48:43 +00:00
parent 9dfcbc1de9
commit fda0b76f18
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
C/exec.c
View File

@ -77,7 +77,11 @@ inline static Int
CallMetaCall(Term mod) { CallMetaCall(Term mod) {
ARG2 = cp_as_integer(B); /* p_save_cp */ ARG2 = cp_as_integer(B); /* p_save_cp */
ARG3 = ARG1; ARG3 = ARG1;
if (mod) {
ARG4 = mod; ARG4 = mod;
} else {
ARG4 = TermProlog;
}
return (CallPredicate(PredMetaCall, B, PredMetaCall->CodeOfPred)); return (CallPredicate(PredMetaCall, B, PredMetaCall->CodeOfPred));
} }

8
pl/boot.yap
View File

@ -675,10 +675,10 @@ incore(G) :- '$execute'(G).
; ;
'$call'(B,CP,G0,M) '$call'(B,CP,G0,M)
). ).
'$call'(\+ X, _, _,_) :- !, '$call'(\+ X, CP, G0, M) :- !,
\+ '$execute'(X). \+ '$call'(X, CP, G0, M).
'$call'(not(X), _, _,_) :- !, '$call'(not(X), CP, G0, M) :- !,
\+ '$execute'(X). \+ '$call'(X, CP, G0, M).
'$call'(!, CP, _,_) :- !, '$call'(!, CP, _,_) :- !,
'$$cut_by'(CP). '$$cut_by'(CP).
'$call'([A|B], _, _, M) :- !, '$call'([A|B], _, _, M) :- !,

12
pl/init.yap
View File

@ -27,12 +27,12 @@ false :- fail.
(:- G) :- '$execute'(G), !. (:- G) :- '$execute'(G), !.
'$$!'(CP) :- '$cut_by'(CP). '$$!'(CP) :- '$cut_by'(CP).
[] :- true. [] :- true.
','(A,B) :- '$current_module'(Module), '$meta_call'((A,B),Module). ','(A,B) :- '$execute'(A), '$execute'(B).
';'(A,B) :- '$current_module'(Module), '$meta_call'((A;B),Module). ';'(A,B) :- ('$execute'(A) ; '$execute'(B)).
'|'(A,B) :- '$current_module'(Module), '$meta_call'((A;B),Module). '|'(A,B) :- ('$execute'(A) ; '$execute'(B)).
'->'(A,B) :- '$current_module'(Module), '$meta_call'((A->B),Module). '->'(A,B) :- ('$execute'(A) -> '$execute'(B)).
\+(G) :- '$current_module'(Module), '$meta_call'(\+(G),Module). \+(G) :- \+ '$execute'(G).
not(G) :- '$current_module'(Module), '$meta_call'(not(G),Module). not(G) :- \+ '$execute'(G).
:- set_value('$doindex',true). :- set_value('$doindex',true).