diff options
Diffstat (limited to 'src/context.c')
| -rw-r--r-- | src/context.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/context.c b/src/context.c index be93db0..756c38e 100644 --- a/src/context.c +++ b/src/context.c @@ -4,6 +4,8 @@ #include <string.h> #include <context.h> +#include <log.h> +#include <preprocess.h> #include <tokenize.h> #include <treeify.h> @@ -55,6 +57,13 @@ void context_destroy(struct ctx *ctx) free(ctx); } +char context_getch(struct ctx *ctx, size_t i) +{ + if (i >= ctx->size || !ctx->data[i]) + errln(&ctx->location, "Unexpected end of buffer"); + return ctx->data[i]; +} + #define CONTEXT_COUNT 3 void context_print(FILE *fd, struct ctx_location *location) { @@ -63,25 +72,26 @@ void context_print(FILE *fd, struct ctx_location *location) for (size_t line = 0, index = 0; line < end_line;) { if (line < start_line) { - if (location->data[index++] == '\n') + if (location->data[index] == '\n' || location->data[index] == MACRO_NEWLINE) line++; + index++; continue; } const char *end = strchr(location->data + index, '\n') + 1; - assert(end); + assert(end > location->data); size_t length = end - (location->data + index) - 1; if (location->line == line) { int pointer_length = location->column + 9; char *pointer = malloc(pointer_length); // Literally a pointer fprintf(fd, - "\x1B[1;32m%6lu | %.*s\x1B[1;31m%c\x1B[1;32m%.*s\n\x1B[1;31m%.*s%c\x1B[0m\n", + "\x1B[1;32m%6lu | %.*s\x1B[1;31m%c\x1B[1;32m%.*s\n\x1B[1;31m%.*s%s\x1B[0m\n", line + 1, (int)location->column, location->data + index, *(location->data + index + location->column), (int)(length - location->column - 1), location->data + index + location->column + 1, pointer_length, - (char *)memset(pointer, '~', pointer_length), '^'); + (char *)memset(pointer, '~', pointer_length), "^ (around here)"); free(pointer); } else { fprintf(fd, "%6lu | %.*s\n", line + 1, (int)length, location->data + index); |