loc->end = *cur;
if (line == INT_MAX && loc->start.line != INT_MAX)
- warn_at (*loc, _("line number overflow"));
+ complain (loc, Wother, _("line number overflow"));
if (column == INT_MAX && loc->start.column != INT_MAX)
- warn_at (*loc, _("column number overflow"));
+ complain (loc, Wother, _("column number overflow"));
}
quotearg_n_style (3, escape_quoting_style, loc.start.file));
if (0 <= loc.start.line)
{
- res += fprintf(out, ":%d", loc.start.line);
+ res += fprintf (out, ":%d", loc.start.line);
if (0 <= loc.start.column)
res += fprintf (out, ".%d", loc.start.column);
}
loc.end.file));
if (0 <= loc.end.line)
{
- res += fprintf(out, ":%d", loc.end.line);
+ res += fprintf (out, ":%d", loc.end.line);
if (0 <= end_col)
res += fprintf (out, ".%d", end_col);
}
return res;
}
+
+/* Persistant data used by location_caret to avoid reopening and rereading the
+ same file all over for each error. */
+struct caret_info
+{
+ FILE *source;
+ size_t line;
+ size_t offset;
+};
+
+static struct caret_info caret_info = { NULL, 1, 0 };
+
+void
+cleanup_caret ()
+{
+ if (caret_info.source)
+ fclose (caret_info.source);
+}
+
+void
+location_caret (FILE *out, location loc)
+{
+ /* FIXME: find a way to support multifile locations, and only open once each
+ file. That would make the procedure future-proof. */
+ if (! (caret_info.source
+ || (caret_info.source = fopen (loc.start.file, "r")))
+ || loc.start.column == -1 || loc.start.line == -1)
+ return;
+
+ /* If the line we want to quote is seekable (the same line as the previous
+ location), just seek it. If it was before, we lost track of it, so
+ return to the start of file. */
+ if (caret_info.line <= loc.start.line)
+ fseek (caret_info.source, caret_info.offset, SEEK_SET);
+ else
+ {
+ caret_info.line = 1;
+ caret_info.offset = 0;
+ fseek (caret_info.source, caret_info.offset, SEEK_SET);
+ }
+
+ /* Advance to the line's position, keeping track of the offset. */
+ while (caret_info.line < loc.start.line)
+ caret_info.line += fgetc (caret_info.source) == '\n';
+ caret_info.offset = ftell (caret_info.source);
+
+ /* Read the actual line. Don't update the offset, so that we keep a pointer
+ to the start of the line. */
+ {
+ char *buf = NULL;
+ size_t size = 0;
+ ssize_t len = getline (&buf, &size, caret_info.source);
+ if (0 < len)
+ {
+ /* The caret of a multiline location ends with the first line. */
+ int end = loc.start.line != loc.end.line ? len : loc.end.column;
+
+ /* Quote the file, indent by a single column. */
+ fputc (' ', out);
+ fwrite (buf, 1, len, out);
+
+ /* Print the caret, with the same indent as above. */
+ fprintf (out, " %*s", loc.start.column - 1, "");
+ {
+ int i = loc.start.column;
+ do
+ fputc ('^', out);
+ while (++i < end);
+ }
+ fputc ('\n', out);
+ }
+ free (buf);
+ }
+}
+
void
boundary_set_from_string (boundary *bound, char *loc_str)
{
/* Must search in reverse since the file name field may
* contain `.' or `:'. */
- char *delim = mbsrchr (loc_str, '.');
+ char *delim = strrchr (loc_str, '.');
aver (delim);
*delim = '\0';
bound->column = atoi (delim+1);
- delim = mbsrchr (loc_str, ':');
+ delim = strrchr (loc_str, ':');
aver (delim);
*delim = '\0';
bound->line = atoi (delim+1);