Merge remote-tracking branch 'origin/maint'

[bison.git] / src / location.c

diff --git a/src/location.c b/src/location.c
index d48a0a1339e4bf1e865587603ce07543dcbf87a5..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;


@@ -155,10 +153,13 @@ cleanup_caret ()
 {
   if (caret_info.source)
     fclose (caret_info.source);
 {
   if (caret_info.source)
     fclose (caret_info.source);

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

 }
 
 void
 }
 
 void

-location_caret (FILE *out, location loc)
+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.  */
 {
   /* FIXME: find a way to support multifile locations, and only open once each
      file. That would make the procedure future-proof.  */


@@ -168,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


@@ -181,35 +182,36 @@ location_caret (FILE *out, location loc)
 
   /* Advance to the line's position, keeping track of the offset.  */
   while (caret_info.line < loc.start.line)
 
   /* 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.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.  */
   {
   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)
+    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;
-

         /* Quote the file, indent by a single column.  */
         /* Quote the file, indent by a single column.  */

-        fputc (' ', out);
-        fwrite (buf, 1, len, out);
+        putc (' ', out);
+        do
+          putc (c, out);
+        while ((c = getc (caret_info.source)) != EOF && c != '\n');
+        putc ('\n', 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);
+          /* 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);

       }
       }

-    free (buf);

   }
 }
 
   }
 }
 


@@ -217,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';