Display causing tokens lexeme directly from source for error messages

Signed-off-by: Mel <mel@rnrd.eu>

1 files changed, 7 insertions, 6 deletions

diff --git a/boot/parse.c b/boot/parse.c
index adf434b..687659e 100644
--- a/boot/parse.c
+++ b/boot/parse.c
@@ -124,7 +124,7 @@ parser_error_display(const struct Parser_Error* error, struct Source_File source
 
     struct Token cause = error->cause;
 
-    fprintf(stderr, ANSI_WHITE "%s:%lu:%lu:\n", source_file.path.data, line, column);
+    STRING_FORMAT_TO(source_file.path, stderr, ANSI_WHITE "%s:%lu:%lu:\n", line, column);
     fprintf(stderr, ANSI_BOLD ANSI_RED "error: " ANSI_WHITE);
     if (error->subkind != PARSER_ERROR_NONE) {
         fprintf(stderr, "%s: %s", parser_error_kind_to_string(error->kind),
@@ -132,15 +132,16 @@ parser_error_display(const struct Parser_Error* error, struct Source_File source
     } else {
         fprintf(stderr, "%s", parser_error_kind_to_string(error->kind));
     }
-    // TODO: display tokens nicely
-    fprintf(stderr, ", got '%s' :(\n", token_kind_to_string(cause.kind));
+    struct String_View cause_lexeme = token_lexeme(&cause, source_file.source);
+    STRING_FORMAT_TO(cause_lexeme, stderr, ", got '%S' :(\n");
 
     struct Span line_span = token_span_to_line_span(cause.span, source_file.source);
 
-    ascii* source_line = source_file.source.data + line_span.start;
-    int source_line_length = line_span.end - line_span.start;
+    struct String_View source_line =
+        string_substring(source_file.source, line_span.start, line_span.end);
 
-    fprintf(stderr, ANSI_WHITE ANSI_NO_BOLD "%lu| %.*s\n", line, source_line_length, source_line);
+    fprintf(stderr, ANSI_WHITE ANSI_NO_BOLD "%lu| ", line);
+    STRING_FORMAT_TO(source_line, stderr, "%S\n");
 
     uint line_number_length = ceil(log10(line + 1));
     fprintf(stderr, ANSI_RED "%*s", (int)(column + 1 + line_number_length), " ");