tests: enable -Wsign-compare and fix corresponding warnings

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index 309b9c0f7432098d2624393908e756adf189aa34..9a60f2503fee878cea309f691ef216f4f39ee014 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -55,20 +55,14 @@ m4_define([b4_position_define],
       if (count)
         {
           column = ]b4_location_initial_column[u;
       if (count)
         {
           column = ]b4_location_initial_column[u;

-          line =
-            0 < count || -count < line
-            ? line + count
-            : ]b4_location_initial_line[;
+          line = add_ (line, count, ]b4_location_initial_line[);

         }
     }
 
     /// (column related) Advance to the COUNT next columns.
     void columns (int count = 1)
     {
         }
     }
 
     /// (column related) Advance to the COUNT next columns.
     void columns (int count = 1)
     {

-      column =
-        0 < count || -count < column
-        ? column + count
-        : ]b4_location_initial_column[;
+      column = add_ (column, count, ]b4_location_initial_column[);

     }
     /** \} */
 
     }
     /** \} */
 


@@ -78,6 +72,15 @@ m4_define([b4_position_define],
     unsigned int line;
     /// Current column number.
     unsigned int column;
     unsigned int line;
     /// Current column number.
     unsigned int column;

+
+  private:
+    /// Compute max(min, lhs+rhs) (provided min <= lhs).
+    static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min)
+    {
+      return (0 < rhs || -static_cast<unsigned int>(rhs) < lhs
+              ? rhs + lhs
+              : min);
+    }

   };
 
   /// Add and assign a position.
   };
 
   /// Add and assign a position.