>>> "Paul" == Paul Eggert <[EMAIL PROTECTED]> writes:
IMHO, there are bits of *.c that should be factored in macros. > Index: data/glr.cc > =================================================================== > RCS file: /cvsroot/bison/bison/data/glr.cc,v > retrieving revision 1.24 > diff -p -u -r1.24 glr.cc > --- data/glr.cc 9 Jul 2006 20:36:33 -0000 1.24 > +++ data/glr.cc 11 Sep 2006 18:54:42 -0000 > @@ -221,6 +221,10 @@ b4_copyright([Skeleton interface for Bis > #ifndef PARSER_HEADER_H > # define PARSER_HEADER_H > +]m4_ifdef([b4_start_header], > +[[/* Copy the %start-header blocks. */ > +]b4_user_start_header])[ > + > #include <string> > #include <iostream> > @@ -233,10 +237,6 @@ namespace ]b4_namespace[ > class location; > } > -]m4_ifdef([b4_start_header], > -[[/* Copy the %start-header blocks. */ > -]b4_user_start_header])[ > - > #include "location.hh" > /* Enabling traces. */ > Index: data/lalr1.cc > =================================================================== > RCS file: /cvsroot/bison/bison/data/lalr1.cc,v > retrieving revision 1.141 > diff -p -u -r1.141 lalr1.cc > --- data/lalr1.cc 11 Aug 2006 19:50:14 -0000 1.141 > +++ data/lalr1.cc 11 Sep 2006 18:54:42 -0000 > @@ -43,6 +43,10 @@ dnl FIXME: This is wrong, we want comput > #ifndef PARSER_HEADER_H > # define PARSER_HEADER_H > +]m4_ifdef([b4_start_header], > +[[/* Copy the %start-header blocks. */ > +]b4_user_start_header])[ > + > #include <string> > #include <iostream> > #include "stack.hh" > @@ -53,12 +57,7 @@ namespace ]b4_namespace[ > class location; > } > -]m4_ifdef([b4_start_header], > -[[/* Copy the %start-header blocks. */ > -]b4_user_start_header])[ > - > -]dnl Include location.hh here: it might depend on headers included above. > -[#include "location.hh" > +#include "location.hh" > /* Enabling traces. */ > #ifndef YYDEBUG
