api.value.type: use keyword/brace values

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index 5879ea374e581bf331b67d30a67baa3c589cb5b1..987843b26cd55e9a7a51850dbedc6d1a185d8597 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -1,6 +1,6 @@
 # C++ skeleton for Bison
 
 # C++ skeleton for Bison
 

-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.

 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],

-           [2002-2012])
+           [2002-2013])

 
 # b4_position_define
 # ------------------
 
 # b4_position_define
 # ------------------


@@ -124,8 +124,9 @@ m4_define([b4_position_define],
    ** \param ostr the destination output stream
    ** \param pos a reference to the position to redirect
    */
    ** \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 << ':';
   {
     if (pos.filename)
       ostr << *pos.filename << ':';


@@ -248,28 +249,28 @@ m4_define([b4_location_define],
    **
    ** Avoid duplicate information.
    */
    **
    ** 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;
-    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;
   }
 ]])
 
 

-# We do want M4 expansion after # for CPP macros.
-m4_changecom()

 b4_defines_if([
 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++])[
 
 /**
 b4_copyright([Positions for Bison parsers in C++])[
 
 /**


@@ -289,7 +290,10 @@ b4_copyright([Positions for Bison parsers in C++])[
 ]b4_position_define[
 ]b4_namespace_close[
 ]b4_cpp_guard_close([b4_dir_prefix[]position.hh])
 ]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++])[
 
 /**
 b4_copyright([Locations for Bison parsers in C++])[
 
 /**


@@ -305,7 +309,8 @@ b4_copyright([Locations for Bison parsers in C++])[
 ]b4_location_define[
 ]b4_namespace_close[
 ]b4_cpp_guard_close([b4_dir_prefix[]location.hh])
 ]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])