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

we're moving down, not up, in both cases!

Browse Source
This commit is contained in:
Vítor Manuel de Morais Santos Costa 2009-10-19 16:39:40 +01:00
parent 91b47a438b
commit d810cbd41d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OPTYap/tab.macros.h
View File

@ -557,6 +557,7 @@ void restore_bindings(tr_fr_ptr unbind_tr, tr_fr_ptr rebind_tr) {
TABLING_ERROR_MESSAGE("unbind_tr < rebind_tr (function restore_bindings)"); TABLING_ERROR_MESSAGE("unbind_tr < rebind_tr (function restore_bindings)");
#endif /* TABLING_ERRORS */ #endif /* TABLING_ERRORS */
end_tr = rebind_tr; end_tr = rebind_tr;
Yap_NEW_MAHASH((ma_h_inner_struct *)H);
while (unbind_tr != end_tr) { while (unbind_tr != end_tr) {
/* unbind loop */ /* unbind loop */
while (unbind_tr > end_tr) { while (unbind_tr > end_tr) {
@ -578,9 +579,11 @@ void restore_bindings(tr_fr_ptr unbind_tr, tr_fr_ptr rebind_tr) {
/* AbsAppl means */ /* AbsAppl means */
/* multi-assignment variable */ /* multi-assignment variable */
/* so the next cell is the old value */ /* so that the upper cell is the old value */
--unbind_tr; --unbind_tr;
if (!Yap_lookup_ma_var(pt)) {
pt[0] = TrailVal(unbind_tr); pt[0] = TrailVal(unbind_tr);
}
#endif #endif
} }
} }
@ -600,7 +603,6 @@ void restore_bindings(tr_fr_ptr unbind_tr, tr_fr_ptr rebind_tr) {
} }
} }
/* rebind loop */ /* rebind loop */
Yap_NEW_MAHASH((ma_h_inner_struct *)H);
while (rebind_tr != end_tr) { while (rebind_tr != end_tr) {
ref = (CELL) TrailTerm(--rebind_tr); ref = (CELL) TrailTerm(--rebind_tr);
if (IsVarTerm(ref)) { if (IsVarTerm(ref)) {
@ -619,10 +621,8 @@ void restore_bindings(tr_fr_ptr unbind_tr, tr_fr_ptr rebind_tr) {
#ifdef MULTI_ASSIGNMENT_VARIABLES #ifdef MULTI_ASSIGNMENT_VARIABLES
} else { } else {
CELL *cell_ptr = RepAppl(ref); CELL *cell_ptr = RepAppl(ref);
if (!Yap_lookup_ma_var(cell_ptr)) {
/* first time we found the variable, let's put the new value */ /* first time we found the variable, let's put the new value */
*cell_ptr = TrailVal(rebind_tr); *cell_ptr = TrailVal(rebind_tr);
}
--rebind_tr; --rebind_tr;
#endif /* MULTI_ASSIGNMENT_VARIABLES */ #endif /* MULTI_ASSIGNMENT_VARIABLES */
} }