1 files changed, 17 insertions, 37 deletions

diff --git a/src/parse.c b/src/parse.c
index 8c69056..5233354 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -44,19 +44,23 @@ struct term *parse_blc(const char *term)
 
 #define BIT_AT(i) (term[(i) / 8] & (1 << (7 - ((i) % 8))))
 
-// parses normal bit-encoded blc
-static struct term *parse_bblc(const char *term, size_t *bit)
+// parses bloc's bit-encoded blc
+// 00M -> abstraction of M
+// 010MN -> application of M and N
+// 1X0 -> bruijn index, amount of 1s in X
+// 011I -> 2B index to entry
+static struct term *parse_bloc_bblc(const char *term, size_t *bit)
 {
 	struct term *res = 0;
 	if (!BIT_AT(*bit) && !BIT_AT(*bit + 1)) {
 		(*bit) += 2;
 		res = new_term(ABS);
-		res->u.abs.term = parse_bblc(term, bit);
-	} else if (!BIT_AT(*bit) && BIT_AT(*bit + 1)) {
-		(*bit) += 2;
+		res->u.abs.term = parse_bloc_bblc(term, bit);
+	} else if (!BIT_AT(*bit) && BIT_AT(*bit + 1) && !BIT_AT(*bit)) {
+		(*bit) += 3;
 		res = new_term(APP);
-		res->u.app.lhs = parse_bblc(term, bit);
-		res->u.app.rhs = parse_bblc(term, bit);
+		res->u.app.lhs = parse_bloc_bblc(term, bit);
+		res->u.app.rhs = parse_bloc_bblc(term, bit);
 	} else if (BIT_AT(*bit)) {
 		const size_t cur = *bit;
 		while (BIT_AT(*bit))
@@ -64,28 +68,8 @@ static struct term *parse_bblc(const char *term, size_t *bit)
 		res = new_term(VAR);
 		res->u.var.index = *bit - cur - 1;
 		(*bit)++;
-	} else {
-		(*bit)++;
-		res = parse_bblc(term, bit);
-	}
-	return res;
-}
-
-// parses bloc's bit-encoded blc (1I => 2B index)
-static struct term *parse_bloc_bblc(const char *term, size_t *bit)
-{
-	struct term *res = 0;
-	if (!BIT_AT(*bit) && !BIT_AT(*bit + 1)) {
-		(*bit) += 2;
-		res = new_term(ABS);
-		res->u.abs.term = parse_bloc_bblc(term, bit);
-	} else if (!BIT_AT(*bit) && BIT_AT(*bit + 1)) {
-		(*bit) += 2;
-		res = new_term(APP);
-		res->u.app.lhs = parse_bloc_bblc(term, bit);
-		res->u.app.rhs = parse_bloc_bblc(term, bit);
-	} else if (BIT_AT(*bit)) {
-		(*bit) += 1;
+	} else if (!BIT_AT(*bit) && BIT_AT(*bit + 1) && BIT_AT(*bit)) {
+		(*bit) += 3;
 		res = new_term(REF);
 		short index = 0;
 		for (int i = 0; i < 16; i++)
@@ -112,19 +96,16 @@ struct bloc_parsed *parse_bloc(const void *bloc)
 	parsed->length = header->length;
 	parsed->entries = malloc(header->length * sizeof(struct term *));
 
-	const struct bloc_entry *current = (const void *)&header->data;
+	const struct bloc_entry *current = (const void *)&header->entries;
 	for (size_t i = 0; i < parsed->length; i++) {
 		size_t len = 0;
-		parsed->entries[i] = parse_bblc((const char *)current, &len);
+		parsed->entries[i] =
+			parse_bloc_bblc((const char *)current, &len);
 		current =
 			(const struct bloc_entry *)(((const char *)current) +
 						    (len / 8) + (len % 8 != 0));
 	}
 
-	size_t len = 0;
-	const char *term = (const char *)current;
-	parsed->term = parse_bloc_bblc(term, &len);
-
 	return parsed;
 }
 
@@ -139,8 +120,7 @@ static struct term *rec_bloc(struct term *term, struct bloc_parsed *bloc)
 		rec_bloc(term->u.app.rhs, bloc);
 		break;
 	case VAR:
-		fprintf(stderr, "bloc can't have vars\n");
-		return 0;
+		break;
 	case REF:
 		if (term->u.ref.index >= bloc->length) {
 			fprintf(stderr, "invalid entry reference\n");