Options and fixes

1 files changed, 27 insertions, 57 deletions

diff --git a/src/build.c b/src/build.c
index d415c29..7867e31 100644
--- a/src/build.c
+++ b/src/build.c
@@ -22,95 +22,65 @@ static void write_bit(char val, FILE *file, char *byte, int *bit)
 	(*bit)++;
 }
 
-static void rec_write_bblc(struct term *term, FILE *file, char *byte, int *bit)
+static void rec_write_bblc(struct tree *tree, FILE *file, char *byte, int *bit)
 {
-	switch (term->type) {
+	switch (tree->type) {
 	case ABS:
 		write_bit(0, file, byte, bit);
 		write_bit(0, file, byte, bit);
-		rec_write_bblc(term->u.abs.term, file, byte, bit);
+		rec_write_bblc(tree->u.abs.term, file, byte, bit);
 		break;
 	case APP:
 		write_bit(0, file, byte, bit);
 		write_bit(1, file, byte, bit);
-		rec_write_bblc(term->u.app.lhs, file, byte, bit);
-		rec_write_bblc(term->u.app.rhs, file, byte, bit);
+		write_bit(0, file, byte, bit);
+		rec_write_bblc(tree->u.app.lhs, file, byte, bit);
+		rec_write_bblc(tree->u.app.rhs, file, byte, bit);
 		break;
 	case VAR:
-		for (int i = 0; i <= term->u.var.index; i++)
+		for (int i = 0; i <= tree->u.var.index; i++)
 			write_bit(1, file, byte, bit);
 		write_bit(0, file, byte, bit);
 		break;
+	case REF:
+		write_bit(0, file, byte, bit);
+		write_bit(1, file, byte, bit);
+		write_bit(1, file, byte, bit);
+
+		// TODO: The bit-order of encoded shorts is kinda arbitrary
+		short ref = tree->u.ref.index;
+		for (int i = 0; i < 16; i++)
+			write_bit((ref >> i) & 1, file, byte, bit);
+		break;
 	default:
-		fprintf(stderr, "Invalid type %d\n", term->type);
+		fprintf(stderr, "invalid type %d\n", tree->type);
 	}
 }
 
 // writes bit-encoded blc into file
-static void write_bblc(struct term *term, FILE *file)
+static void write_bblc(struct tree *tree, FILE *file)
 {
 	char byte = 0;
 	int bit = 0;
-	rec_write_bblc(term, file, &byte, &bit);
+	rec_write_bblc(tree, file, &byte, &bit);
 
 	if (bit) // flush final
 		fwrite(&byte, 1, 1, file);
 }
 
-void write_bloc(struct term *term, const char *path)
+void write_bloc(struct list *table, const char *path)
 {
-	(void)term; // TODO
-
-	// example data
-	short length = 2;
-	struct term *M = parse_blc("0000000001100111100111100111100111011110");
-	struct term *N = parse_blc("00000000011001111001111001100111011110");
+	short length = table->val;
 
 	FILE *file = fopen(path, "wb");
 	fwrite(BLOC_IDENTIFIER, BLOC_IDENTIFIER_LENGTH, 1, file);
 	fwrite(&length, 2, 1, file);
 
-	write_bblc(M, file);
-	write_bblc(N, file);
-
-	// TODO
-	char byte = 0;
-	int bit = 0;
-	write_bit(0, file, &byte, &bit);
-	write_bit(0, file, &byte, &bit);
-	write_bit(0, file, &byte, &bit);
-	write_bit(1, file, &byte, &bit);
-	write_bit(0, file, &byte, &bit);
-	write_bit(1, file, &byte, &bit);
-	write_bit(0, file, &byte, &bit);
-	write_bit(1, file, &byte, &bit);
-	write_bit(1, file, &byte, &bit);
-
-	for (int i = 0; i < 16; i++)
-		write_bit(0, file, &byte, &bit);
-
-	write_bit(0, file, &byte, &bit);
-	write_bit(0, file, &byte, &bit);
-	write_bit(1, file, &byte, &bit);
-
-	for (int i = 0; i < 16; i++)
-		write_bit(0, file, &byte, &bit);
-
-	write_bit(1, file, &byte, &bit);
-
-	for (int i = 0; i < 16; i++)
-		write_bit(0, file, &byte, &bit);
-
-	write_bit(1, file, &byte, &bit);
-
-	for (int i = 0; i < 16; i++)
-		write_bit(0, file, &byte, &bit);
-
-	if (bit) // flush final
-		fwrite(&byte, 1, 1, file);
+	struct list *iterator = table;
+	while (iterator) {
+		write_bblc(iterator->data, file);
+		iterator = iterator->next;
+	}
 
 	fclose(file);
-
-	free_term(M);
-	free_term(N);
 }