warnings: fusion of complain and complain_at

[bison.git] / src / location.c

diff --git a/src/location.c b/src/location.c
index 4cbfd8db0c03c386e2dae197cefab0ddbccf9366..a749415878e2c1f0708beb54f0a814d5d18c18ba 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-2012 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,48 +90,52 @@ 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.  */
 }
 
 
 /* Output to OUT the location LOC.
    Warning: it uses quotearg's slot 3.  */

-void
+unsigned

 location_print (FILE *out, location loc)
 {
 location_print (FILE *out, location loc)
 {

+  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;

 }
 
 void
 }
 
 void