Merge remote-tracking branch 'origin/maint'

[bison.git] / src / location.c

diff --git a/src/location.c b/src/location.c
index 4cbfd8db0c03c386e2dae197cefab0ddbccf9366..662b2a12a07bde5c07b0fabbd698a1661d3ad0f7 100644 (file)
--- a/src/location.c
+++ b/src/location.c
@@ -1,6 +1,6 @@
 /* Locations for Bison
 /* Locations for Bison

-   Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-   Inc.
+
+   Copyright (C) 2002, 2005-2013 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -42,7 +42,7 @@ add_column_width (int column, char const *buf, size_t bufsize)
   if (buf)
     {
       if (INT_MAX / 2 <= bufsize)
   if (buf)
     {
       if (INT_MAX / 2 <= bufsize)

-       return INT_MAX;
+        return INT_MAX;

       width = mbsnwidth (buf, bufsize, 0);
     }
   else
       width = mbsnwidth (buf, bufsize, 0);
     }
   else


@@ -69,19 +69,19 @@ location_compute (location *loc, boundary *cur, char const *token, size_t size)
     switch (*p)
       {
       case '\n':
     switch (*p)
       {
       case '\n':

-       line += line < INT_MAX;
-       column = 1;
-       p0 = p + 1;
-       break;
+        line += line < INT_MAX;
+        column = 1;
+        p0 = p + 1;
+        break;

 
       case '\t':
 
       case '\t':

-       column = add_column_width (column, p0, p - p0);
-       column = add_column_width (column, NULL, 8 - ((column - 1) & 7));
-       p0 = p + 1;
-       break;
+        column = add_column_width (column, p0, p - p0);
+        column = add_column_width (column, NULL, 8 - ((column - 1) & 7));
+        p0 = p + 1;
+        break;

 
       default:
 
       default:

-       break;
+        break;

       }
 
   cur->line = line;
       }
 
   cur->line = line;


@@ -90,55 +90,136 @@ location_compute (location *loc, boundary *cur, char const *token, size_t size)
   loc->end = *cur;
 
   if (line == INT_MAX && loc->start.line != INT_MAX)
   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)
   if (column == INT_MAX && loc->start.column != INT_MAX)

-    warn_at (*loc, _("column number overflow"));
+    complain (loc, Wother, _("column number overflow"));

 }
 
 
 }
 
 

-/* Output to OUT the location LOC.
-   Warning: it uses quotearg's slot 3.  */
-void
-location_print (FILE *out, location loc)
+unsigned
+location_print (location loc, FILE *out)

 {
 {

+  unsigned res = 0;

   int end_col = 0 != loc.end.column ? loc.end.column - 1 : 0;
   int end_col = 0 != loc.end.column ? loc.end.column - 1 : 0;

-  fprintf (out, "%s",
-           quotearg_n_style (3, escape_quoting_style, loc.start.file));
+  res += fprintf (out, "%s",
+                  quotearg_n_style (3, escape_quoting_style, loc.start.file));

   if (0 <= loc.start.line)
     {
   if (0 <= loc.start.line)
     {

-      fprintf(out, ":%d", loc.start.line);
+      res += fprintf (out, ":%d", loc.start.line);

       if (0 <= loc.start.column)
       if (0 <= loc.start.column)

-        fprintf (out, ".%d", loc.start.column);
+        res += fprintf (out, ".%d", loc.start.column);

     }
   if (loc.start.file != loc.end.file)
     {
     }
   if (loc.start.file != loc.end.file)
     {

-      fprintf (out, "-%s",
-               quotearg_n_style (3, escape_quoting_style, loc.end.file));
+      res += fprintf (out, "-%s",
+                      quotearg_n_style (3, escape_quoting_style,
+                                        loc.end.file));

       if (0 <= loc.end.line)
         {
       if (0 <= loc.end.line)
         {

-          fprintf(out, ":%d", loc.end.line);
+          res += fprintf (out, ":%d", loc.end.line);

           if (0 <= end_col)
           if (0 <= end_col)

-            fprintf (out, ".%d", end_col);
+            res += fprintf (out, ".%d", end_col);

         }
     }
   else if (0 <= loc.end.line)
     {
       if (loc.start.line < loc.end.line)
         {
         }
     }
   else if (0 <= loc.end.line)
     {
       if (loc.start.line < loc.end.line)
         {

-          fprintf (out, "-%d", loc.end.line);
+          res += fprintf (out, "-%d", loc.end.line);

           if (0 <= end_col)
           if (0 <= end_col)

-            fprintf (out, ".%d", end_col);
+            res += fprintf (out, ".%d", end_col);

         }
       else if (0 <= end_col && loc.start.column < end_col)
         }
       else if (0 <= end_col && loc.start.column < end_col)

-        fprintf (out, "-%d", 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);
+  caret_info.source = NULL;
+  caret_info.line = 1;
+  caret_info.offset = 0;
+}
+
+void
+location_caret (location loc, FILE *out)
+{
+  /* 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 a previous line, 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 += getc (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 c = getc (caret_info.source);
+    if (c != EOF)
+      {
+        /* Quote the file, indent by a single column.  */
+        putc (' ', out);
+        do
+          putc (c, out);
+        while ((c = getc (caret_info.source)) != EOF && c != '\n');
+        putc ('\n', out);
+
+        {
+          /* The caret of a multiline location ends with the first line.  */
+          size_t len = loc.start.line != loc.end.line
+            ? ftell (caret_info.source) - caret_info.offset
+            : loc.end.column;
+          int i;
+
+          /* Print the carets (at least one), with the same indent as above.*/
+          fprintf (out, " %*s", loc.start.column - 1, "");
+          for (i = loc.start.column; i == loc.start.column || i < len; ++i)
+            putc ('^', out);
+          }
+        putc ('\n', out);
+      }
+  }

 }
 
 void
 boundary_set_from_string (boundary *bound, char *loc_str)
 {
   /* Must search in reverse since the file name field may
 }
 
 void
 boundary_set_from_string (boundary *bound, char *loc_str)
 {
   /* Must search in reverse since the file name field may

-   * contain `.' or `:'.  */
+   * contain '.' or ':'.  */

   char *delim = strrchr (loc_str, '.');
   aver (delim);
   *delim = '\0';
   char *delim = strrchr (loc_str, '.');
   aver (delim);
   *delim = '\0';