From 328e34077a2017d4017f907ac69c7ed5d6c160d4 Mon Sep 17 00:00:00 2001 From: David Phillips Date: Wed, 1 Aug 2018 20:21:37 +1200 Subject: Trim leading whitespace from contextual error, detect EOF Side-note that the token location tuple maintains the correct column number to include the whitespace in the source file. Side-side note: tabs are counted as one column but many editors will count them as whatever the tabstop/tabwidth is. --- common.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'common.c') diff --git a/common.c b/common.c index 96c9b72..c0e0af4 100644 --- a/common.c +++ b/common.c @@ -7,13 +7,19 @@ indicate_file_area(FILE* fd, size_t line, size_t column, size_t span) { char margin[] = " "; /* FIXME use proper line counting, not this hack */ char buf[1024]; + char *line_start = &buf; + rewind(fd); for (; line; line--) { fgets(buf, sizeof(buf), fd); } + while (*line_start == '\t' || *line_start == ' ') { + line_start++; + } + fputs(margin, stderr); - fputs(buf, stderr); + fputs(line_start, stderr); /* corner case (still needed?) - buf was just return */ if (strlen(buf) == 1 && buf[0] == '\n') { -- cgit v1.1