Added parent hashmaps

1 files changed, 7 insertions, 17 deletions

diff --git a/src/term.c b/src/term.c
index 1479134..a240312 100644
--- a/src/term.c
+++ b/src/term.c
@@ -18,6 +18,7 @@ struct term *term_new(term_type_t type, hash_t hash, size_t depth)
 	term->refs = 1;
 	term->hash = hash;
 	term->depth = depth;
+	term->parents = hashmap_new(sizeof(struct term *), 0, 0);
 	return term;
 }
 
@@ -46,20 +47,18 @@ void term_print(struct term *term)
 
 struct term *term_rehash_abs(struct term *head, struct term *term)
 {
-	/* assert(head->u.abs.term->hash != term->hash); */
-
 	hash_t res =
 		hash((uint8_t *)&head->type, sizeof(head->type), term->hash);
 
 	assert(res != head->hash);
 
-	struct term *match = map_get(res);
+	struct term *match = map_get(map_all_terms(), res);
 	if (match) { // already exists
 		return match;
 	} else { // create new
 		struct term *new = term_new(ABS, res, head->depth);
 		new->u.abs.term = term;
-		map_set(new, res);
+		map_set(map_all_terms(), new, res);
 		return new;
 	}
 }
@@ -67,30 +66,20 @@ struct term *term_rehash_abs(struct term *head, struct term *term)
 struct term *term_rehash_app(struct term *head, struct term *lhs,
 			     struct term *rhs)
 {
-	/* assert(head->u.app.lhs->hash != lhs->hash || */
-	/*        head->u.app.rhs->hash != rhs->hash); */
-
 	hash_t res =
 		hash((uint8_t *)&head->type, sizeof(head->type), lhs->hash);
 	res = hash((uint8_t *)&res, sizeof(res), rhs->hash);
 
 	assert(res != head->hash);
 
-	struct term *match = map_get(res);
+	struct term *match = map_get(map_all_terms(), res);
 	if (match) { // already exists
-		/* term_refer(match, head->depth); */
-		/* term_deref(head); */
 		return match;
 	} else { // create new
 		struct term *new = term_new(APP, res, head->depth);
 		new->u.app.lhs = lhs;
 		new->u.app.rhs = rhs;
-		/* if (head->u.app.lhs->hash != lhs->hash) */
-		/* 	term_refer(lhs, head->depth + 1); */
-		/* if (head->u.app.rhs->hash != rhs->hash) */
-		/* 	term_refer(rhs, head->depth + 1); */
-		/* term_deref(head); */
-		map_set(new, res);
+		map_set(map_all_terms(), new, res);
 		return new;
 	}
 }
@@ -118,7 +107,8 @@ void term_deref_head(struct term *term)
 {
 	term->refs--;
 	if (term->refs == 0) {
-		map_delete(term);
+		map_delete(map_all_terms(), term);
+		map_destroy(term->parents);
 		free(term);
 	}
 }