1 files changed, 6 insertions, 60 deletions

diff --git a/src/log.c b/src/log.c
index 5820a67..0e59ea2 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,78 +1,24 @@
+#include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <log.h>
 
-static void context_print(FILE *fd, struct ctx *ctx)
+void errln(struct ctx_location *location, const char *fmt, ...)
 {
-	const char *data = ctx->data ? ctx->data : ctx->raw;
+	fprintf(stderr, "\x1B[1;36m%s:%lu:%lu:\x1B[0m ", location->path, location->line + 1,
+		location->column + 1);
 
-	// Find line, column
-	size_t line = 0, column = 0, index = 0;
-	for (; index < ctx->size; index++) {
-		char cur = data[index];
+	fprintf(stderr, "\x1B[1;31mError:\x1B[0m ");
 
-		column++;
-
-		if (line == ctx->line && column == ctx->column)
-			break;
-
-		if (cur == '\n') {
-			line++;
-			column = 0;
-			continue;
-		} else if (cur == '\0') {
-			fprintf(stderr, "Invalid context!");
-			context_destroy(ctx);
-			exit(1);
-			break;
-		}
-	}
-
-	if (++index >= ctx->size)
-		return; // Couldn't find context, idc?
-
-	fprintf(fd, "\x1B[1;36m%s:%ld:%ld:\x1B[0m '", ctx->path, ctx->line + 1, ctx->column + 1);
-
-	// Print line context
-	size_t start = ctx->column > 5 ? index - 5 : index;
-	size_t end = ctx->size - index > 5 ? index + 5 : index + 1;
-	for (size_t i = start; i < end; i++) {
-		if (i == index) {
-			fprintf(fd, "\x1B[1;32m%c\x1B[0m", data[i]);
-		} else {
-			fprintf(fd, "%c", data[i]);
-		}
-	}
-	fprintf(fd, "': ");
-}
-
-void errln(struct ctx *ctx, const char *fmt, ...)
-{
-	context_print(stderr, ctx);
-
-	fprintf(stderr, "\x1B[1;31m");
 	va_list ap;
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
-	fprintf(stderr, "\n");
 	va_end(ap);
-	fprintf(stderr, "\x1B[0m");
 
-	context_destroy(ctx);
-	exit(1);
-}
-
-void err(const char *fmt, ...)
-{
-	fprintf(stderr, "\x1B[1;31m");
-	va_list ap;
-	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
 	fprintf(stderr, "\n");
-	va_end(ap);
-	fprintf(stderr, "\x1B[0m");
+	context_print(stderr, location);
 
 	exit(1);
 }