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

make sure throw goes away on deterministic computations.

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-05-04 18:10:07 -05:00
parent d7559c3f96
commit 42442bd360
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pl/boot.yap
View File

@ -1124,8 +1124,10 @@ expand_term(Term,Expanded) :-
% where was the previous catch % where was the previous catch
catch(G, C, A) :- catch(G, C, A) :-
'$catch'(C,A,_), '$catch'(C,A,_),
yap_hacks:current_choice_point(CP0),
'$execute'(G), '$execute'(G),
'$true'. yap_hacks:current_choice_point(CP1),
(CP0 == CP1 -> !; true ).
% makes sure we have an environment. % makes sure we have an environment.
'$true'. '$true'.
@ -1139,8 +1141,10 @@ catch(G, C, A) :-
'$system_catch'(G, M, C, A) :- '$system_catch'(G, M, C, A) :-
% check current trail % check current trail
'$catch'(C,A,_), '$catch'(C,A,_),
yap_hacks:current_choice_point(CP0),
'$execute_nonstop'(G, M), '$execute_nonstop'(G, M),
'$true'. yap_hacks:current_choice_point(CP1),
(CP0 == CP1 -> !; true ).
% %
% throw has to be *exactly* after system catch! % throw has to be *exactly* after system catch!