tests: AT_YYERROR_DEFINE: prepare for list of ints.

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index da70d9d10e91fc9da1e71c14d9d947638bf6122b..f45f634e20b0dad26e1ea75c9912ec5732aa1855 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -23,12 +23,11 @@ b4_copyright([Positions for Bison parsers in C++],
              [2002-2007, 2009-2012])[
 
 /**
              [2002-2007, 2009-2012])[
 
 /**

- ** \file position.hh
+ ** \file ]b4_dir_prefix[position.hh

  ** Define the ]b4_namespace_ref[::position class.
  */
 
  ** Define the ]b4_namespace_ref[::position class.
  */
 

-#ifndef BISON_POSITION_HH
-# define BISON_POSITION_HH
+]b4_cpp_guard_open([b4_dir_prefix[]position.hh])[

 
 # include <iostream>
 # include <string>
 
 # include <iostream>
 # include <string>


@@ -54,11 +53,13 @@ b4_copyright([Positions for Bison parsers in C++],
 
 ]])[
     /// Initialization.
 
 ]])[
     /// Initialization.

-    void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL)
+    void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL,
+                     unsigned int l = ]b4_location_initial_line[u,
+                     unsigned int c = ]b4_location_initial_column[u)

     {
       filename = fn;
     {
       filename = fn;

-      line = ]b4_location_initial_line[u;
-      column = ]b4_location_initial_column[u;
+      line = l;
+      column = c;

     }
 
     /** \name Line and Column related manipulators
     }
 
     /** \name Line and Column related manipulators


@@ -146,18 +147,17 @@ b4_copyright([Positions for Bison parsers in C++],
   }
 
 ]b4_namespace_close[
   }
 
 ]b4_namespace_close[

-#endif // not BISON_POSITION_HH]
+]b4_cpp_guard_close([b4_dir_prefix[]position.hh])

 @output(b4_dir_prefix[]location.hh@)@
 b4_copyright([Locations for Bison parsers in C++],
 @output(b4_dir_prefix[]location.hh@)@
 b4_copyright([Locations for Bison parsers in C++],

-             [2002-2007, 2009-2011])[
+             [2002-2007, 2009-2012])[

 
 /**
 
 /**

- ** \file location.hh
+ ** \file ]b4_dir_prefix[location.hh

  ** Define the ]b4_namespace_ref[::location class.
  */
 
  ** Define the ]b4_namespace_ref[::location class.
  */
 

-#ifndef BISON_LOCATION_HH
-# define BISON_LOCATION_HH
+]b4_cpp_guard_open([b4_dir_prefix[]location.hh])[

 
 # include <iostream>
 # include <string>
 
 # include <iostream>
 # include <string>


@@ -195,9 +195,11 @@ b4_copyright([Locations for Bison parsers in C++],
 
 ])[
     /// Initialization.
 
 ])[
     /// Initialization.

-    void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL)
+    void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULL,
+                     unsigned int l = ]b4_location_initial_line[u,
+                     unsigned int c = ]b4_location_initial_column[u)

     {
     {

-      begin.initialize (fn);
+      begin.initialize (f, l, c);

       end = begin;
     }
 
       end = begin;
     }
 


@@ -291,6 +293,6 @@ b4_copyright([Locations for Bison parsers in C++],
 
 ]b4_namespace_close[
 
 
 ]b4_namespace_close[
 

-#endif // not BISON_LOCATION_HH]
+]b4_cpp_guard_close([b4_dir_prefix[]location.hh])

 m4_divert_pop(0)
 m4_changecom([#])
 m4_divert_pop(0)
 m4_changecom([#])