Merge remote-tracking branch 'origin/maint'

[bison.git] / src / location.c

diff --git a/src/location.c b/src/location.c
index 1a7d65c221db7504731e7654111af0672d5373ba..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-2012 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.
 


@@ -96,10 +96,8 @@ location_compute (location *loc, boundary *cur, char const *token, size_t size)
 }
 
 
 }
 
 

-/* Output to OUT the location LOC.
-   Warning: it uses quotearg's slot 3.  */

 unsigned
 unsigned

-location_print (FILE *out, location loc)
+location_print (location loc, FILE *out)

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


@@ -143,27 +141,27 @@ location_print (FILE *out, location loc)
    same file all over for each error.  */
 struct caret_info
 {
    same file all over for each error.  */
 struct caret_info
 {

-  FILE* source;
+  FILE *source;

   size_t line;
   size_t offset;
 };
 
 static struct caret_info caret_info = { NULL, 1, 0 };
 
   size_t line;
   size_t offset;
 };
 
 static struct caret_info caret_info = { NULL, 1, 0 };
 

-/* Free any allocated ressources and close any open file handles that are
-   left-over by the usage of location_caret.  */

 void
 cleanup_caret ()
 {
   if (caret_info.source)
     fclose (caret_info.source);
 void
 cleanup_caret ()
 {
   if (caret_info.source)
     fclose (caret_info.source);

+  caret_info.source = NULL;
+  caret_info.line = 1;
+  caret_info.offset = 0;

 }
 
 }
 

-/* Output to OUT the line and caret corresponding to location LOC.  */

 void
 void

-location_caret (FILE *out, location loc)
+location_caret (location loc, FILE *out)

 {
 {

-  /* FIXME: find a way to support X-file locations, and only open once each
+  /* 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")))
      file. That would make the procedure future-proof.  */
   if (! (caret_info.source
          || (caret_info.source = fopen (loc.start.file, "r")))


@@ -171,8 +169,8 @@ location_caret (FILE *out, location loc)
     return;
 
   /* If the line we want to quote is seekable (the same line as the previous
     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.  */
+     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
   if (caret_info.line <= loc.start.line)
     fseek (caret_info.source, caret_info.offset, SEEK_SET);
   else


@@ -183,40 +181,36 @@ location_caret (FILE *out, location loc)
     }
 
   /* Advance to the line's position, keeping track of the offset.  */
     }
 
   /* Advance to the line's position, keeping track of the offset.  */

-  {
-    int i;
-    for (i = caret_info.line; i < loc.start.line; caret_info.offset++)
-      if (fgetc (caret_info.source) == '\n')
-        ++i;
-  }
-  caret_info.line = loc.start.line;
+  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.  */
   {
 
   /* Read the actual line.  Don't update the offset, so that we keep a pointer
      to the start of the line.  */
   {

-    ssize_t len = 0;
-    char *buf = NULL;
-    if ((len = getline (&buf, (size_t*) &len, caret_info.source)) != -1)
+    char c = getc (caret_info.source);
+    if (c != EOF)

       {
       {

-        /* The caret of a multiline location ends with the first line.  */
-        int end = loc.start.line != loc.end.line ? len : loc.end.column;
-
-        if (len)
-          {
-            int i = loc.start.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.  */
-            fputc (' ', out);
-            fprintf (out, "%*s", loc.start.column - 1, "");
-            do {
-              fputc ('^', out);
-            } while (++i < end);
+        /* 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);

           }
           }

-        fputc ('\n', out);
-        free (buf);
+        putc ('\n', out);

       }
   }
 }
       }
   }
 }


@@ -225,7 +219,7 @@ void
 boundary_set_from_string (boundary *bound, char *loc_str)
 {
   /* Must search in reverse since the file name field may
 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';