WIP

Author: infradig

src/query.c

@@ -655,7 +655,7 @@ static void push_frame(query *q)
 }
 
 // Note: TCO's clause might not be the caller clause... hence passing
-// num_vars. Currently restricted to the same predicate though.
+// num_vars. Currently restricted to the same predicate though (still?).
 
 static void reuse_frame(query *q, unsigned num_vars)
 {
@@ -671,7 +671,7 @@ static void reuse_frame(query *q, unsigned num_vars)
 
 	for (pl_idx i = 0; i < num_vars; i++) {
 		unshare_cell(&to->c);
-		*to++ = *from++;
+		*to++ = *from++;					// Slots are contiguous
 	}
 
 	fold->initial_slots = fold->actual_slots = num_vars;

tests/tests/test101.expected

@@ -1,6 +1,6 @@
-test1: [f,4,c,5,t,4,s,8]
-test2: [f,4,c,5,t,4,s,8]
-test3: [f,4,c,5,t,4,s,8]
+test1: [f,5,c,5,t,5,s,10]
+test2: [f,5,c,5,t,5,s,10]
+test3: [f,5,c,5,t,5,s,11]
 test4: [f,4,c,5,t,4,s,8]
 test5: [f,4,c,5,t,4,s,8]
 test6: [f,200004,c,5,t,200004,s,500008]