From b61c6978270c01879cfe49b10a3adeffbe3a0887 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 29 Jan 2003 06:31:02 +0000 Subject: [PATCH 1/1] Do not use @output_header_name@ unless b4_defines_flag is set. This fixes two bugs reported by Tim Van Holder in and . --- data/lalr1.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/data/lalr1.cc b/data/lalr1.cc index a2329e3a..7ab5435a 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -1,6 +1,6 @@ m4_divert(-1) # C++ skeleton for Bison -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003 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 @@ -87,9 +87,10 @@ m4_define([b4_constructor], # We do want M4 expansion after # for CPP macros. m4_changecom() m4_divert(0)dnl -@output @output_header_name@ +m4_if(b4_defines_flag, 0, [], +[@output @output_header_name@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], - [2002])[ + [2002, 2003])[ /* FIXME: This is wrong, we want computed header guards. I don't know why the macros are missing now. :( */ #ifndef PARSER_HEADER_H @@ -282,12 +283,12 @@ namespace yy } #endif /* ! defined PARSER_HEADER_H */] -dnl +])dnl @output @output_parser_name@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], - [2002])[ + [2002, 2003]) -#include @output_header_name@ +m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[ /* Enable debugging if requested. */ #if YYDEBUG @@ -766,7 +767,7 @@ const yy::]b4_parser_class_name[::TokenNumberType yy::]b4_parser_class_name[::un ]b4_epilogue dnl @output stack.hh -b4_copyright([2002])[ +b4_copyright([2002, 2003])[ #ifndef BISON_STACK_HH # define BISON_STACK_HH @@ -863,7 +864,7 @@ namespace yy #endif // not BISON_STACK_HH] dnl @output location.hh -b4_copyright([2002])[ +b4_copyright([2002, 2003])[ #ifndef BISON_LOCATION_HH # define BISON_LOCATION_HH -- 2.45.2