Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-19 17:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

diagnostics: fix handling of style in limit cases

Browse Source 
* src/location.c (location_caret): Beware of the cases where the start
and end columns are the same, or when the location is multilines.
This commit is contained in:
Akim Demaille
2019-03-23 07:11:26 +01:00
parent 01855ca328
commit 22a413ce9f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/location.c
View File

@@ -192,10 +192,15 @@ location_caret (location loc, const char *style, FILE *out)
if (col == loc.start.column) if (col == loc.start.column)
begin_use_class (style, out); begin_use_class (style, out);
fputc (c, out); fputc (c, out);
if (col + 1 == loc.end.column) if (loc.start.column == loc.end.column
? col == loc.end.column
: col + 1 == loc.end.column)
end_use_class (style, out); end_use_class (style, out);
} }
while ((c = getc (caret_info.source)) != EOF && c != '\n'); while ((c = getc (caret_info.source)) != EOF && c != '\n');
/* Close the style, in the case of a multiline location. */
if (loc.start.line != loc.end.line)
end_use_class (style, out);
putc ('\n', out); putc ('\n', out);
{ {
@@ -211,7 +216,7 @@ location_caret (location loc, const char *style, FILE *out)
for (i = loc.start.column; i == loc.start.column || i < len; ++i) for (i = loc.start.column; i == loc.start.column || i < len; ++i)
putc (i == loc.start.column ? '^' : '~', out); putc (i == loc.start.column ? '^' : '~', out);
end_use_class (style, out); end_use_class (style, out);
} }
putc ('\n', out); putc ('\n', out);
} }
} }