xml: also use "%empty" with html output

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index 74c114582b7a1d306e8000e3c510d6a524f0561c..e80742a51f7d93d91c805e2a148a28f37ae53d31 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -25,10 +25,9 @@ m4_define([b4_position_define],
 [[  /// Abstract a position.
   class position
   {
 [[  /// Abstract a position.
   class position
   {

-  public:
-]m4_ifdef([b4_location_constructors], [[
+  public:]m4_ifdef([b4_location_constructors], [[

     /// Construct a position.
     /// Construct a position.

-    explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULL,
+    explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,

                        unsigned int l = ]b4_location_initial_line[u,
                        unsigned int c = ]b4_location_initial_column[u)
       : filename (f)
                        unsigned int l = ]b4_location_initial_line[u,
                        unsigned int c = ]b4_location_initial_column[u)
       : filename (f)


@@ -39,7 +38,7 @@ m4_define([b4_position_define],
 
 ]])[
     /// Initialization.
 
 ]])[
     /// Initialization.

-    void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL,
+    void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULLPTR,

                      unsigned int l = ]b4_location_initial_line[u,
                      unsigned int c = ]b4_location_initial_column[u)
     {
                      unsigned int l = ]b4_location_initial_line[u,
                      unsigned int c = ]b4_location_initial_column[u)
     {


@@ -53,14 +52,17 @@ m4_define([b4_position_define],
     /// (line related) Advance to the COUNT next lines.
     void lines (int count = 1)
     {
     /// (line related) Advance to the COUNT next lines.
     void lines (int count = 1)
     {

-      column = ]b4_location_initial_column[u;
-      line += count;
+      if (count)
+        {
+          column = ]b4_location_initial_column[u;
+          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 = std::max (]b4_location_initial_column[u, column + count);
+      column = add_ (column, count, ]b4_location_initial_column[);

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


@@ -70,36 +72,44 @@ 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.
   inline position&
   };
 
   /// Add and assign a position.
   inline position&

-  operator+= (position& res, const int width)
+  operator+= (position& res, int width)

   {
     res.columns (width);
     return res;
   }
 
   /// Add two position objects.
   {
     res.columns (width);
     return res;
   }
 
   /// Add two position objects.

-  inline const position
-  operator+ (const position& begin, const int width)
+  inline position
+  operator+ (position res, int width)

   {
   {

-    position res = begin;

     return res += width;
   }
 
   /// Add and assign a position.
   inline position&
     return res += width;
   }
 
   /// Add and assign a position.
   inline position&

-  operator-= (position& res, const int width)
+  operator-= (position& res, int width)

   {
     return res += -width;
   }
 
   /// Add two position objects.
   {
     return res += -width;
   }
 
   /// Add two position objects.

-  inline const position
-  operator- (const position& begin, const int width)
+  inline position
+  operator- (position res, int width)

   {
   {

-    return begin + -width;
+    return res -= width;

   }
 ]b4_percent_define_flag_if([[define_location_comparison]], [[
   /// Compare two position objects.
   }
 ]b4_percent_define_flag_if([[define_location_comparison]], [[
   /// Compare two position objects.


@@ -168,7 +178,7 @@ m4_define([b4_location_define],
 
 ])[
     /// Initialization.
 
 ])[
     /// Initialization.

-    void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULL,
+    void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,

                      unsigned int l = ]b4_location_initial_line[u,
                      unsigned int c = ]b4_location_initial_column[u)
     {
                      unsigned int l = ]b4_location_initial_line[u,
                      unsigned int c = ]b4_location_initial_column[u)
     {


@@ -186,13 +196,13 @@ m4_define([b4_location_define],
     }
 
     /// Extend the current location to the COUNT next columns.
     }
 
     /// Extend the current location to the COUNT next columns.

-    void columns (unsigned int count = 1)
+    void columns (int count = 1)

     {
       end += count;
     }
 
     /// Extend the current location to the COUNT next lines.
     {
       end += count;
     }
 
     /// Extend the current location to the COUNT next lines.

-    void lines (unsigned int count = 1)
+    void lines (int count = 1)

     {
       end.lines (count);
     }
     {
       end.lines (count);
     }


@@ -207,26 +217,35 @@ m4_define([b4_location_define],
   };
 
   /// Join two location objects to create a location.
   };
 
   /// Join two location objects to create a location.

-  inline const location operator+ (const location& begin, const location& end)
+  inline location operator+ (location res, const location& end)

   {
   {

-    location res = begin;

     res.end = end.end;
     return res;
   }
 
     res.end = end.end;
     return res;
   }
 

-  /// Add two location objects.
-  inline const location operator+ (const location& begin, unsigned int width)
+  /// Change end position in place.
+  inline location& operator+= (location& res, int width)

   {
   {

-    location res = begin;

     res.columns (width);
     return res;
   }
 
     res.columns (width);
     return res;
   }
 

-  /// Add and assign a location.
-  inline location& operator+= (location& res, unsigned int width)
+  /// Change end position.
+  inline location operator+ (location res, int width)

   {
   {

-    res.columns (width);
-    return res;
+    return res += width;
+  }
+
+  /// Change end position in place.
+  inline location& operator-= (location& res, int width)
+  {
+    return res += -width;
+  }
+
+  /// Change end position.
+  inline location operator- (const location& begin, int width)
+  {
+    return begin + -width;

   }
 ]b4_percent_define_flag_if([[define_location_comparison]], [[
   /// Compare two location objects.
   }
 ]b4_percent_define_flag_if([[define_location_comparison]], [[
   /// Compare two location objects.


@@ -253,16 +272,17 @@ m4_define([b4_location_define],
   inline std::basic_ostream<YYChar>&
   operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
   {
   inline std::basic_ostream<YYChar>&
   operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
   {

-    position last = loc.end - 1;
-    ostr << loc.begin;
-    if (last.filename
+    unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
+    ostr << loc.begin// << "(" << loc.end << ") "
+;
+    if (loc.end.filename

         && (!loc.begin.filename
         && (!loc.begin.filename

-            || *loc.begin.filename != *last.filename))
-      ostr << '-' << last;
-    else if (loc.begin.line != last.line)
-      ostr << '-' << last.line  << '.' << last.column;
-    else if (loc.begin.column != last.column)
-      ostr << '-' << last.column;
+            || *loc.begin.filename != *loc.end.filename))
+      ostr << '-' << loc.end.filename << ':' << loc.end.line << '.' << end_col;
+    else if (loc.begin.line < loc.end.line)
+      ostr << '-' << loc.end.line << '.' << end_col;
+    else if (loc.begin.column < end_col)
+      ostr << '-' << end_col;

     return ostr;
   }
 ]])
     return ostr;
   }
 ]])