diagnostics: improve -fcaret for list of accepted values

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index 14688ca4e32f57034507ae8a7fe82084b23c97a7..631247a7961bb2d94028203352a9074be719b8a5 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -73,7 +73,7 @@ m4_define([b4_position_define],
   };
 
   /// Add and assign a position.
-  inline const position&
+  inline position&
   operator+= (position& res, const int width)
   {
     res.columns (width);
@@ -89,7 +89,7 @@ m4_define([b4_position_define],
   }
 
   /// Add and assign a position.
-  inline const position&
+  inline position&
   operator-= (position& res, const int width)
   {
     return res += -width;
@@ -124,8 +124,9 @@ m4_define([b4_position_define],
    ** \param ostr the destination output stream
    ** \param pos a reference to the position to redirect
    */
-  inline std::ostream&
-  operator<< (std::ostream& ostr, const position& pos)
+  template <typename YYChar>
+  inline std::basic_ostream<YYChar>&
+  operator<< (std::basic_ostream<YYChar>& ostr, const position& pos)
   {
     if (pos.filename)
       ostr << *pos.filename << ':';
@@ -248,7 +249,9 @@ m4_define([b4_location_define],
    **
    ** Avoid duplicate information.
    */
-  inline std::ostream& operator<< (std::ostream& ostr, const location& loc)
+  template <typename YYChar>
+  inline std::basic_ostream<YYChar>&
+  operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
   {
     position last = loc.end - 1;
     ostr << loc.begin;
@@ -268,8 +271,7 @@ m4_define([b4_location_define],
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 b4_defines_if([
-m4_divert_push(0)dnl
-@output(b4_dir_prefix[]position.hh@)@
+b4_output_begin([b4_dir_prefix[]position.hh])
 b4_copyright([Positions for Bison parsers in C++])[
 
 /**
@@ -289,7 +291,10 @@ b4_copyright([Positions for Bison parsers in C++])[
 ]b4_position_define[
 ]b4_namespace_close[
 ]b4_cpp_guard_close([b4_dir_prefix[]position.hh])
-@output(b4_dir_prefix[]location.hh@)@
+b4_output_end()
+
+
+b4_output_begin([b4_dir_prefix[]location.hh])
 b4_copyright([Locations for Bison parsers in C++])[
 
 /**
@@ -305,7 +310,8 @@ b4_copyright([Locations for Bison parsers in C++])[
 ]b4_location_define[
 ]b4_namespace_close[
 ]b4_cpp_guard_close([b4_dir_prefix[]location.hh])
-m4_divert_pop(0)
-])# b4_defines_if
-m4_popdef([b4_copyright_years])dnl
-m4_changecom([#])
+b4_output_end()
+])
+
+
+m4_popdef([b4_copyright_years])