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

Merge branch 'master' of gitosis@yap.dcc.fc.up.pt:yap-6

This commit is contained in:
Vitor Santos Costa 2009-07-28 21:38:26 -05:00
parent 9c74080512 93c6e65b7e
commit daa05caf86
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
C/heapgc.c
View File

@ -1971,13 +1971,10 @@ mark_choicepoints(register choiceptr gc_B, tr_fr_ptr saved_TR, int very_verbose)
mark_environments((CELL_PTR) gc_B->cp_env,
EnvSizeInCells,
NULL);
else
#ifdef TABLING
if (opnum != _table_completion)
#endif /* TABLING */
mark_environments((CELL_PTR) gc_B->cp_env,
EnvSize((yamop *) (gc_B->cp_cp)),
EnvBMap((yamop *) (gc_B->cp_cp)));
else if (opnum != _trust_fail)
mark_environments((CELL_PTR) gc_B->cp_env,
EnvSize((yamop *) (gc_B->cp_cp)),
EnvBMap((yamop *) (gc_B->cp_cp)));
/* extended choice point */
restart_cp:
switch (opnum) {
@ -2854,9 +2851,6 @@ sweep_choicepoints(choiceptr gc_B)
} else
return;
case _trust_fail:
sweep_environments(gc_B->cp_env,
EnvSizeInCells,
NULL);
break;
case _or_else:
case _or_last:

2
H/absmi.h
View File

@ -881,7 +881,7 @@ Macros to check the limits of stacks
#endif
#ifdef TABLING
#define TABLING_close_alt(CPTR) (CPTR)->cp_ap = NULL
#define TABLING_close_alt(CPTR) (CPTR)->cp_ap = TRUSTFAILCODE
#else
#define TABLING_close_alt(CPTR)
#endif /* TABLING */