Back out previous patch.

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index 2d32bf77bf8f8c62ebaadd07a935f2d8d712e8bf..773a3a5da49fc8adf0cdd0d398ed3c89db0b0167 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -1,8 +1,7 @@
-m4_divert(-1)
-
 # 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
@@ -21,14 +20,14 @@ m4_divert(-1)
 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
-m4_divert(0)dnl
-@output b4_dir_prefix[]position.hh
+m4_divert_push(0)dnl
+@output(b4_dir_prefix[]position.hh@)
 b4_copyright([Positions for Bison parsers in C++],
   [2002, 2003, 2004, 2005, 2006])[
 
 /**
  ** \file position.hh
- ** Define the ]b4_namespace[::position class.
+ ** Define the ]b4_percent_define_get([[namespace]])[::position class.
  */
 
 #ifndef BISON_POSITION_HH
@@ -38,7 +37,7 @@ b4_copyright([Positions for Bison parsers in C++],
 # include <string>
 # include <algorithm>
 
-namespace ]b4_namespace[
+namespace ]b4_percent_define_get([[namespace]])[
 {
   /// Abstract a position.
   class position
@@ -53,7 +52,7 @@ namespace ]b4_namespace[
 
 ])[
     /// 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[;
@@ -79,7 +78,7 @@ namespace ]b4_namespace[
 
   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.
@@ -115,7 +114,7 @@ namespace ]b4_namespace[
   {
     return begin + -width;
   }
-]m4_if(b4_define_location_comparison, [1], [[
+]m4_if(b4_percent_define_get([[define_location_comparison]]), [1], [[
   /// Compare two position objects.
   inline bool
   operator== (const position& pos1, const position& pos2)
@@ -147,13 +146,13 @@ namespace ]b4_namespace[
 
 }
 #endif // not BISON_POSITION_HH]
-@output b4_dir_prefix[]location.hh
+@output(b4_dir_prefix[]location.hh@)
 b4_copyright([Locations for Bison parsers in C++],
   [2002, 2003, 2004, 2005, 2006])[
 
 /**
  ** \file location.hh
- ** Define the ]b4_namespace[::location class.
+ ** Define the ]b4_percent_define_get([[namespace]])[::location class.
  */
 
 #ifndef BISON_LOCATION_HH
@@ -163,7 +162,7 @@ b4_copyright([Locations for Bison parsers in C++],
 # include <string>
 # include "position.hh"
 
-namespace ]b4_namespace[
+namespace ]b4_percent_define_get([[namespace]])[
 {
 
   /// Abstract a location.
@@ -179,7 +178,7 @@ namespace ]b4_namespace[
 
 ])[
     /// Initialization.
-    inline void initialize (]b4_filename_type[* fn)
+    inline void initialize (]b4_percent_define_get([[filename_type]])[* fn)
     {
       begin.initialize (fn);
       end = begin;
@@ -237,7 +236,7 @@ namespace ]b4_namespace[
     res.columns (width);
     return res;
   }
-]m4_if(b4_define_location_comparison, [1], [[
+]m4_if(b4_percent_define_get([[define_location_comparison]]), [1], [[
   /// Compare two location objects.
   inline bool
   operator== (const location& loc1, const location& loc2)
@@ -276,5 +275,5 @@ namespace ]b4_namespace[
 }
 
 #endif // not BISON_LOCATION_HH]
-m4_divert(-1)
+m4_divert_pop(0)
 m4_changecom([#])