gnulib: update

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 34eef13801a661d2db596f4d0da6612f7521d1fd..7b2aef2d85f82b6150f77dd490bd42047c4e9e36 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -120,10 +120,9 @@ m4_pushdef([b4_copyright_years],
 m4_define([b4_parser_class_name],
           [b4_percent_define_get([[parser_class_name]])])
 
-b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [],
-  [# Backward compatibility.
+b4_bison_locations_if([# Backward compatibility.
    m4_define([b4_location_constructors])
-   m4_include(b4_pkgdatadir/[location.cc])])])
+   m4_include(b4_pkgdatadir/[location.cc])])
 m4_include(b4_pkgdatadir/[stack.hh])
 b4_variant_if([m4_include(b4_pkgdatadir/[variant.hh])])
 
@@ -139,8 +138,7 @@ m4_define([b4_shared_declarations],
 # include <stdexcept>
 # include <string>]b4_defines_if([[
 # include "stack.hh"
-]b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [],
-                                          [[# include "location.hh"]])])])[
+]b4_bison_locations_if([[# include "location.hh"]])])[
 
 ]b4_YYDEBUG_define[
 
@@ -148,9 +146,8 @@ m4_define([b4_shared_declarations],
 
 ]b4_defines_if([],
 [b4_stack_define
-b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [],
-                                         [b4_position_define
-b4_location_define])])])[
+b4_bison_locations_if([b4_position_define
+b4_location_define])])[
 
 ]b4_variant_if([b4_variant_define])[
 
@@ -335,11 +332,8 @@ b4_public_types_define])[
 ]b4_percent_code_get([[provides]])[
 ]])
 
-# We do want M4 expansion after # for CPP macros.
-m4_changecom()
 b4_defines_if(
-[m4_divert_push(0)dnl
-@output(b4_spec_defines_file@)@
+[b4_output_begin([b4_spec_defines_file])
 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++])
 [
 /**
@@ -352,12 +346,11 @@ b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++])
 ]b4_cpp_guard_open([b4_spec_defines_file])[
 ]b4_shared_declarations[
 ]b4_cpp_guard_close([b4_spec_defines_file])
-m4_divert_pop(0)dnl
+b4_output_end()
 ])
 
 
-m4_divert_push(0)dnl
-@output(b4_parser_file_name@)@
+b4_output_begin([b4_parser_file_name])
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++])
 b4_percent_code_get([[top]])[]dnl
 m4_if(b4_prefix, [yy], [],
@@ -1141,5 +1134,7 @@ b4_error_verbose_if([state_type yystate, int yytoken],
 ]b4_token_ctor_if([], [b4_yytranslate_define])[
 ]b4_namespace_close[
 ]b4_epilogue[]dnl
-m4_divert_pop(0)
+b4_output_end()
+
+
 m4_popdef([b4_copyright_years])dnl