diff --git a/C/cdmgr.c b/C/cdmgr.c index b7c601872..a4520ba63 100644 --- a/C/cdmgr.c +++ b/C/cdmgr.c @@ -11,8 +11,11 @@ * File: cdmgr.c * * comments: Code manager * * * -* Last rev: $Date: 2006-03-20 19:51:43 $,$Author: vsc $ * +* Last rev: $Date: 2006-03-21 17:11:39 $,$Author: vsc $ * * $Log: not supported by cvs2svn $ +* Revision 1.178 2006/03/20 19:51:43 vsc +* fix indexing and tabling bugs +* * Revision 1.177 2006/03/06 14:04:56 vsc * fixes to garbage collector * fixes to debugger @@ -995,7 +998,6 @@ kill_off_lu_block(LogUpdIndex *c, LogUpdIndex *parent, PredEntry *ap) { /* first, make sure that I killed off all my children, some children may remain in case I have tables as children */ - kill_children(c, ap); decrease_log_indices(c, (yamop *)&(ap->cs.p_code.ExpandCode)); if (parent != NULL) { /* sat bye bye */ diff --git a/C/index.c b/C/index.c index 806408e48..7dc123a76 100644 --- a/C/index.c +++ b/C/index.c @@ -11,8 +11,11 @@ * File: index.c * * comments: Indexing a Prolog predicate * * * -* Last rev: $Date: 2006-03-21 15:06:35 $,$Author: vsc $ * +* Last rev: $Date: 2006-03-21 17:11:39 $,$Author: vsc $ * * $Log: not supported by cvs2svn $ +* Revision 1.155 2006/03/21 15:06:35 vsc +* fixes to handle expansion of dyn amic predicates more efficiently. +* * Revision 1.154 2006/03/20 19:51:43 vsc * fix indexing and tabling bugs * @@ -4842,7 +4845,7 @@ count_clauses_left(yamop *cl, PredEntry *ap) static ClausePointer index_jmp(ClausePointer cur, yamop *ipc, int is_lu, yamop *e_code) { - if (cur.lui == NULL) { + if (cur.lui == NULL || TRUE) { cur.lui = NULL; return cur; } @@ -4873,7 +4876,7 @@ index_jmp(ClausePointer cur, yamop *ipc, int is_lu, yamop *e_code) cur.lui = NULL; return cur; } - cur.lui = lcur; + cur.lui = ncur; return cur; } else { StaticIndex *scur = cur.si;