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

more constraint simplifications

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1135 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2004-09-13 21:19:14 +00:00
parent 6b43be23cf
commit 8402df6bb2
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
C/attvar.c
View File

@ -161,7 +161,6 @@ WakeAttVar(CELL* pt1, CELL reg2)
return; return;
} }
if (susp2 >= attv) { if (susp2 >= attv) {
if (susp2 == attv) return;
if (!IsVarTerm(susp2->Value) || !IsUnboundVar(susp2->Value)) { if (!IsVarTerm(susp2->Value) || !IsUnboundVar(susp2->Value)) {
/* oops, our goal is on the queue to be woken */ /* oops, our goal is on the queue to be woken */
if (!Yap_unify(susp2->Value, (CELL)pt1)) { if (!Yap_unify(susp2->Value, (CELL)pt1)) {

1
C/exec.c
View File

@ -131,6 +131,7 @@ do_execute(Term t, Term mod)
/* disable creeping when we do goal expansion */ /* disable creeping when we do goal expansion */
if (ActiveSignals & YAP_CREEP_SIGNAL) { if (ActiveSignals & YAP_CREEP_SIGNAL) {
ActiveSignals &= ~YAP_CREEP_SIGNAL; ActiveSignals &= ~YAP_CREEP_SIGNAL;
CreepFlag = CalculateStackGap();
DelayedTrace = TRUE; DelayedTrace = TRUE;
} }
UNLOCK(SignalLock); UNLOCK(SignalLock);

4
pl/corout.yap
View File

@ -57,7 +57,8 @@
%'$wake_up_goal'([Module1|Continuation],G) :- %'$wake_up_goal'([Module1|Continuation],G) :-
% '$write'(4,vsc_woke:G+[Module1|Continuation]:' % '$write'(4,vsc_woke:G+[Module1|Continuation]:'
%'), fail. %'), fail.
'$wake_up_goal'([Module1|Continuation], LG) :- '$wake_up_goal'([Module1|Continuation], LG0) :-
'$sort'(LG0,LG),
'$execute_woken_system_goals'(LG), '$execute_woken_system_goals'(LG),
'$do_continuation'(Continuation, Module1). '$do_continuation'(Continuation, Module1).
@ -94,6 +95,7 @@
'$execute_woken_system_goal'('$att_do'(V,New)) :- '$execute_woken_system_goal'('$att_do'(V,New)) :-
( '$frozen_goals'(V, Goals) -> ( '$frozen_goals'(V, Goals) ->
'$call_atts'(V,New), '$call_atts'(V,New),
% write(vsc:Goals),nl,
'$execute_frozen_goals'(Goals) '$execute_frozen_goals'(Goals)
; ;
'$call_atts'(V,New) '$call_atts'(V,New)

2
pl/ground.yap
View File

@ -55,11 +55,9 @@ numbervars(Term, M, N) :-
'$numbermarked_vars'(L, M, N). '$numbermarked_vars'(L, M, N).
'$numbermarked_vars'([], M, M). '$numbermarked_vars'([], M, M).
/*
'$numbermarked_vars'([V|L], M, N) :- '$numbermarked_vars'([V|L], M, N) :-
attvar(V), !, attvar(V), !,
'$numbermarked_vars'(L, M, N). '$numbermarked_vars'(L, M, N).
*/
'$numbermarked_vars'(['$VAR'(M)|L], M, N) :- '$numbermarked_vars'(['$VAR'(M)|L], M, N) :-
M1 is M+1, M1 is M+1,
'$numbermarked_vars'(L, M1, N). '$numbermarked_vars'(L, M1, N).