REVERTTrying SWI-style, re issue #482 & #484

Author: infradig

src/print.c

@@ -615,8 +615,8 @@ static void print_iso_list(query *q, cell *c, pl_idx c_ctx, int running, bool co
 #endif
 
 			if (q->portray_vars || q->do_dump_vars) {
-				SB_sprintf(q->sb, "%s", q->p->vartab.var_name[q->dump_var_nbr]);
-				//SB_sprintf(q->sb, "%s", q->p->vartab.var_name[save_head->var_nbr]);
+				//SB_sprintf(q->sb, "%s", q->p->vartab.var_name[q->dump_var_nbr]);
+				SB_sprintf(q->sb, "%s", q->p->vartab.var_name[save_head->var_nbr]);
 				//print_variable(q, save_head, save_head_ctx, running);
 			} else {
 				SB_sprintf(q->sb, "%s", "...");
@@ -685,8 +685,8 @@ static void print_iso_list(query *q, cell *c, pl_idx c_ctx, int running, bool co
 			}
 
 			if (q->portray_vars || q->do_dump_vars) {
-				SB_sprintf(q->sb, "%s", q->p->vartab.var_name[q->dump_var_nbr]);
-				//SB_sprintf(q->sb, "%s", q->p->vartab.var_name[save_tail->var_nbr]);
+				//SB_sprintf(q->sb, "%s", q->p->vartab.var_name[q->dump_var_nbr]);
+				SB_sprintf(q->sb, "%s", q->p->vartab.var_name[save_tail->var_nbr]);
 				//print_variable(q, save_head, save_head_ctx, running);
 			} else {
 				SB_sprintf(q->sb, "%s", "...");

src/toplevel.c

@@ -276,10 +276,10 @@ static void add_result(int nbr, cell *c, pl_idx c_ctx)
 
 static int check_duplicate_result(query *q, int nbr, cell *c, pl_idx c_ctx)
 {
-	//return -1;
+	return -1;
 
-	//if (is_cyclic_term(q, c, c_ctx))
-	//	return -1;
+	if (is_cyclic_term(q, c, c_ctx))
+		return -1;
 
 	const item *ptr = g_items;