Fixed some use-after-frees

1 files changed, 17 insertions, 7 deletions

diff --git a/src/schedule.c b/src/schedule.c
index 1362b1e..407c6e0 100644
--- a/src/schedule.c
+++ b/src/schedule.c
@@ -4,6 +4,7 @@
 #include <math.h>
 #include <time.h>
 #include <stdlib.h>
+#include <assert.h>
 
 #include <schedule.h>
 #include <reduce.h>
@@ -59,16 +60,26 @@ static pqueue_pri_t calculate_priority(struct term *term)
 
 void schedule_add(struct term *term)
 {
-	if (!(term->type == APP && term->u.app.lhs->type == ABS))
-		return; // no beta redex
+	if (!term_is_beta_redex(term))
+		return;
 
 	set_pri(term, calculate_priority(term));
 	pqueue_insert(queue, term);
 }
 
+void schedule_remove(struct term *term)
+{
+	if (!term_is_beta_redex(term))
+		return;
+
+	int error = pqueue_remove(queue, term);
+	assert(!error);
+}
+
 void schedule(void)
 {
-	while (pqueue_size(queue) > 0) {
+	while (pqueue_size(queue) > 1) {
+		fprintf(stderr, "queue size: %zu\n", pqueue_size(queue));
 		map_dump(map_all_terms());
 
 		// TODO: check finished programs
@@ -85,10 +96,9 @@ void schedule_sync_priorities(void)
 	void *iter_val;
 	while (hashmap_iter(map_all_terms(), &iter, &iter_val)) {
 		struct term *term = *(struct term **)iter_val;
-		if (term->type == APP && term->u.app.lhs->type == ABS) {
-			pqueue_change_priority(queue, calculate_priority(term),
-					       term);
-		}
+		if (!term_is_beta_redex(term))
+			continue;
+		pqueue_change_priority(queue, calculate_priority(term), term);
 	}
 }