* NEWS (2.3a+): Mention yesterday's state-removal change.

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index 80e712eac4e2873e6daa3ca2b0350d70f8954e0c..68ae2f719586c2cf025546b4c867213c1641e7d6 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -1,6 +1,7 @@
 # C++ skeleton for Bison
 
 # C++ skeleton for Bison
 

-# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 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


@@ -26,7 +27,7 @@ b4_copyright([Positions for Bison parsers in C++],
 
 /**
  ** \file position.hh
 
 /**
  ** \file position.hh

- ** Define the ]b4_namespace[::position class.
+ ** Define the ]b4_percent_define_get([[namespace]])[::position class.

  */
 
 #ifndef BISON_POSITION_HH
  */
 
 #ifndef BISON_POSITION_HH


@@ -36,7 +37,7 @@ b4_copyright([Positions for Bison parsers in C++],
 # include <string>
 # include <algorithm>
 
 # include <string>
 # include <algorithm>
 

-namespace ]b4_namespace[
+namespace ]b4_percent_define_get([[namespace]])[

 {
   /// Abstract a position.
   class position
 {
   /// Abstract a position.
   class position


@@ -51,7 +52,7 @@ namespace ]b4_namespace[
 
 ])[
     /// Initialization.
 
 ])[
     /// Initialization.

-    inline void initialize (]b4_filename_type[* fn)
+    inline void initialize (]b4_percent_define_get([[filename_type]])[* fn)

     {
       filename = fn;
       line = ]b4_location_initial_line[;
     {
       filename = fn;
       line = ]b4_location_initial_line[;


@@ -77,7 +78,7 @@ namespace ]b4_namespace[
 
   public:
     /// File name to which this position refers.
 
   public:
     /// File name to which this position refers.

-    ]b4_filename_type[* filename;
+    ]b4_percent_define_get([[filename_type]])[* filename;

     /// Current line number.
     unsigned int line;
     /// Current column number.
     /// Current line number.
     unsigned int line;
     /// Current column number.


@@ -113,7 +114,7 @@ namespace ]b4_namespace[
   {
     return begin + -width;
   }
   {
     return begin + -width;
   }

-]m4_if(b4_define_location_comparison, [1], [[
+]b4_percent_define_flag_if([[define_location_comparison]], [[

   /// Compare two position objects.
   inline bool
   operator== (const position& pos1, const position& pos2)
   /// Compare two position objects.
   inline bool
   operator== (const position& pos1, const position& pos2)


@@ -151,7 +152,7 @@ b4_copyright([Locations for Bison parsers in C++],
 
 /**
  ** \file location.hh
 
 /**
  ** \file location.hh

- ** Define the ]b4_namespace[::location class.
+ ** Define the ]b4_percent_define_get([[namespace]])[::location class.

  */
 
 #ifndef BISON_LOCATION_HH
  */
 
 #ifndef BISON_LOCATION_HH


@@ -161,7 +162,7 @@ b4_copyright([Locations for Bison parsers in C++],
 # include <string>
 # include "position.hh"
 
 # include <string>
 # include "position.hh"
 

-namespace ]b4_namespace[
+namespace ]b4_percent_define_get([[namespace]])[

 {
 
   /// Abstract a location.
 {
 
   /// Abstract a location.


@@ -177,7 +178,7 @@ namespace ]b4_namespace[
 
 ])[
     /// Initialization.
 
 ])[
     /// Initialization.

-    inline void initialize (]b4_filename_type[* fn)
+    inline void initialize (]b4_percent_define_get([[filename_type]])[* fn)

     {
       begin.initialize (fn);
       end = begin;
     {
       begin.initialize (fn);
       end = begin;


@@ -235,7 +236,7 @@ namespace ]b4_namespace[
     res.columns (width);
     return res;
   }
     res.columns (width);
     return res;
   }

-]m4_if(b4_define_location_comparison, [1], [[
+]b4_percent_define_flag_if([[define_location_comparison]], [[

   /// Compare two location objects.
   inline bool
   operator== (const location& loc1, const location& loc2)
   /// Compare two location objects.
   inline bool
   operator== (const location& loc1, const location& loc2)