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

meta-call should not have choice-points when co-routyining starts. This

Browse Source 
happened because of ; Thanks to Patrick Caldron.


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@709 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2002-11-26 23:00:32 +00:00
parent 7e5b706936
commit 28ec10b764
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pl/boot.yap
View File

@ -749,15 +749,19 @@ not(A) :-
'$call'(A, _, _,CurMod) :- '$call'(A, _, _,CurMod) :-
( (
% goal_expansion is defined, or % goal_expansion is defined, or
'$pred_goal_expansion_on' '$pred_goal_expansion_on' ->
'$expand_call'(A,CurMod)
; ;
% this is a meta-predicate % this is a meta-predicate
'$flags'(A,CurMod,F,_), F /\ 0x200000 =:= 0x200000 '$flags'(A,CurMod,F,_), F /\ 0x200000 =:= 0x200000 ->
), !, '$expand_call'(A,CurMod)
;
'$execute0'(A, CurMod)
).
'$expand_call'(A,CurMod) :-
'$expand_goal'(A, CurMod, CurMod, NG, NMod), '$expand_goal'(A, CurMod, CurMod, NG, NMod),
'$execute0'(NG, NMod). '$execute0'(NG, NMod).
'$call'(A, _, _, M) :-
'$execute0'(A, M).
'$spied_call'((A,B),CP,G0,M) :- !, '$spied_call'((A,B),CP,G0,M) :- !,
'$execute_within'(A,CP,G0,M), '$execute_within'(A,CP,G0,M),
@ -796,17 +800,27 @@ not(A) :-
'$$cut_by'(CP). '$$cut_by'(CP).
'$spied_call'([A|B],_,_,M) :- !, '$spied_call'([A|B],_,_,M) :- !,
'$csult'([A|B], M). '$csult'([A|B], M).
'$spied_call'(A, _CP, _G0, CurMod) :- '$spied_call'(A, CP, G0, CurMod) :-
( (
% goal_expansion is defined, or % goal_expansion is defined, or
'$pred_goal_expansion_on' '$pred_goal_expansion_on'
->
'$finish_spied_call'(A,CurMod)
; ;
% this is a meta-predicate % this is a meta-predicate
'$flags'(A,CurMod,F,_), F /\ 0x200000 =:= 0x200000 '$flags'(A,CurMod,F,_), F /\ 0x200000 =:= 0x200000
), !, ->
'$finish_spied_call'(A,CurMod)
;
% finish_it_off (careful with co-routining)
'$std_spied_call'(A, CP, G0, CurMod)
).
'$finish_spied_call'(A,CurMod) :-
'$expand_goal'(A, CurMod, CurMod, NG, NMod), '$expand_goal'(A, CurMod, CurMod, NG, NMod),
'$execute0'(NG, NMod). '$execute0'(NG, NMod).
'$spied_call'(A, CP, G0, M) :-
'$std_spied_call'(A, CP, G0, M) :-
( '$undefined'(A, M) -> ( '$undefined'(A, M) ->
functor(A,F,N), functor(A,F,N),
( '$recorded'('$import','$import'(S,M,F,N),_) -> ( '$recorded'('$import','$import'(S,M,F,N),_) ->