Merge tag 'v2.5.1_rc2'

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index ef5e1cee4a871030d8ef7e933bad51559b247e4b..92f93c2c75d6b98a9bdac4d4f10bd5d74a2f19cb 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -126,8 +126,8 @@ b4_defines_if([],
 
 b4_locations_if([b4_percent_define_ifdef([[location_type]], [],
   [# Backward compatibility.
 
 b4_locations_if([b4_percent_define_ifdef([[location_type]], [],
   [# Backward compatibility.

-  m4_define([b4_location_constructors])
-  m4_include(b4_pkgdatadir/[location.cc])])])
+   m4_define([b4_location_constructors])
+   m4_include(b4_pkgdatadir/[location.cc])])])

 m4_include(b4_pkgdatadir/[stack.hh])
 b4_variant_if([m4_include(b4_pkgdatadir/[variant.hh])])
 
 m4_include(b4_pkgdatadir/[stack.hh])
 b4_variant_if([m4_include(b4_pkgdatadir/[variant.hh])])
 


@@ -136,12 +136,15 @@ m4_changecom()
 m4_divert_push(0)dnl
 @output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++])
 m4_divert_push(0)dnl
 @output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++])

-dnl FIXME: This is wrong, we want computed header guards.

 [
 [

+/**
+ ** \file ]b4_spec_defines_file[
+ ** Define the ]b4_namespace_ref[::parser class.
+ */
+

 /* C++ LALR(1) parser skeleton written by Akim Demaille.  */
 
 /* C++ LALR(1) parser skeleton written by Akim Demaille.  */
 

-#ifndef PARSER_HEADER_H
-# define PARSER_HEADER_H
+]b4_cpp_guard_open([b4_spec_defines_file])[

 
 ]b4_percent_code_get([[requires]])[
 
 
 ]b4_percent_code_get([[requires]])[
 


@@ -358,10 +361,9 @@ b4_public_types_define])[
  /* Redirection for backward compatibility.  */
 # define YYSTYPE b4_namespace_ref::b4_parser_class_name::semantic_type
 #endif
  /* Redirection for backward compatibility.  */
 # define YYSTYPE b4_namespace_ref::b4_parser_class_name::semantic_type
 #endif

-])
-b4_percent_code_get([[provides]])[]dnl
-
-[#endif /* ! defined PARSER_HEADER_H */]
+])[
+]b4_percent_code_get([[provides]])[
+]b4_cpp_guard_close([b4_spec_defines_file])

 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++])
 b4_percent_code_get([[top]])[]dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++])
 b4_percent_code_get([[top]])[]dnl