more constraint simplifications
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1135 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
parent
6b43be23cf
commit
8402df6bb2
@ -161,7 +161,6 @@ WakeAttVar(CELL* pt1, CELL reg2)
|
||||
return;
|
||||
}
|
||||
if (susp2 >= attv) {
|
||||
if (susp2 == attv) return;
|
||||
if (!IsVarTerm(susp2->Value) || !IsUnboundVar(susp2->Value)) {
|
||||
/* oops, our goal is on the queue to be woken */
|
||||
if (!Yap_unify(susp2->Value, (CELL)pt1)) {
|
||||
|
1
C/exec.c
1
C/exec.c
@ -131,6 +131,7 @@ do_execute(Term t, Term mod)
|
||||
/* disable creeping when we do goal expansion */
|
||||
if (ActiveSignals & YAP_CREEP_SIGNAL) {
|
||||
ActiveSignals &= ~YAP_CREEP_SIGNAL;
|
||||
CreepFlag = CalculateStackGap();
|
||||
DelayedTrace = TRUE;
|
||||
}
|
||||
UNLOCK(SignalLock);
|
||||
|
@ -57,7 +57,8 @@
|
||||
%'$wake_up_goal'([Module1|Continuation],G) :-
|
||||
% '$write'(4,vsc_woke:G+[Module1|Continuation]:'
|
||||
%'), fail.
|
||||
'$wake_up_goal'([Module1|Continuation], LG) :-
|
||||
'$wake_up_goal'([Module1|Continuation], LG0) :-
|
||||
'$sort'(LG0,LG),
|
||||
'$execute_woken_system_goals'(LG),
|
||||
'$do_continuation'(Continuation, Module1).
|
||||
|
||||
@ -94,6 +95,7 @@
|
||||
'$execute_woken_system_goal'('$att_do'(V,New)) :-
|
||||
( '$frozen_goals'(V, Goals) ->
|
||||
'$call_atts'(V,New),
|
||||
% write(vsc:Goals),nl,
|
||||
'$execute_frozen_goals'(Goals)
|
||||
;
|
||||
'$call_atts'(V,New)
|
||||
|
@ -55,11 +55,9 @@ numbervars(Term, M, N) :-
|
||||
'$numbermarked_vars'(L, M, N).
|
||||
|
||||
'$numbermarked_vars'([], M, M).
|
||||
/*
|
||||
'$numbermarked_vars'([V|L], M, N) :-
|
||||
attvar(V), !,
|
||||
'$numbermarked_vars'(L, M, N).
|
||||
*/
|
||||
'$numbermarked_vars'(['$VAR'(M)|L], M, N) :-
|
||||
M1 is M+1,
|
||||
'$numbermarked_vars'(L, M1, N).
|
||||
|
Reference in New Issue
Block a user