fix extra CP.

This commit is contained in:
Vítor Santos Costa 2012-06-08 13:26:11 +01:00
parent 58c3445d82
commit e55d143e8d
1 changed files with 10 additions and 9 deletions

View File

@ -470,16 +470,15 @@ true :- true.
'$execute'(G), '$execute'(G),
yap_hacks:current_choice_point(NCP), yap_hacks:current_choice_point(NCP),
( '$enter_system_mode' ; '$exit_system_mode', fail), ( '$enter_system_mode' ; '$exit_system_mode', fail),
yap_hacks:current_choice_point(NCP1), '$delayed_goals'(G, V, NV, LGs, DCP),
'$delayed_goals'(G, V, NV, LGs),
yap_hacks:current_choice_point(NCP2),
'$write_answer'(NV, LGs, Written), '$write_answer'(NV, LGs, Written),
'$write_query_answer_true'(Written), '$write_query_answer_true'(Written),
( (
'$prompt_alternatives_on'(determinism), CP = NCP, NCP1 = NCP2 -> '$prompt_alternatives_on'(determinism), CP = NCP, DCP = 0 ->
nl(user_error), nl(user_error),
! !
; ;
'$another', '$another',
! !
), ),
@ -492,7 +491,7 @@ true :- true.
'$yes_no'(G,C) :- '$yes_no'(G,C) :-
'$current_module'(M), '$current_module'(M),
'$do_yes_no'(G,M), '$do_yes_no'(G,M),
'$delayed_goals'(G, [], NV, LGs), '$delayed_goals'(G, [], NV, LGs, _),
'$write_answer'(NV, LGs, Written), '$write_answer'(NV, LGs, Written),
( Written = [] -> ( Written = [] ->
!,'$present_answer'(C, yes); !,'$present_answer'(C, yes);
@ -505,13 +504,15 @@ true :- true.
'$add_env_and_fail' :- fail. '$add_env_and_fail' :- fail.
'$delayed_goals'(G, V, NV, LGs) :- '$delayed_goals'(G, V, NV, LGs, NCP) :-
( (
'$attributes':delayed_goals(G, V, NV, LGs) yap_hacks:current_choice_point(NCP1),
'$attributes':delayed_goals(G, V, NV, LGs),
yap_hacks:current_choice_point(NCP2)
*-> *->
true NCP is NCP2-NCP1
; ;
copy_term_nat(V, NV), LGs = [] copy_term_nat(V, NV), LGs = [], NCP = 0
). ).
'$out_neg_answer' :- '$out_neg_answer' :-