From 61cf46782024568e573431a082f071174f648164 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 31 Oct 2003 08:43:39 +0000 Subject: [PATCH] * bin/autom4te.in (&freeze): Use a less likely warning separator than `nn', so that `nnn' is valid in warnings. Reported by Steve Huston. --- ChangeLog | 6 ++++++ THANKS | 3 ++- bin/autom4te.in | 7 ++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7a0e7ed..54d5f2cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-10-31 Akim Demaille + + * bin/autom4te.in (&freeze): Use a less likely warning separator + than `\n\n', so that `\n\n\n' is valid in warnings. + Reported by Steve Huston. + 2003-10-28 Akim Demaille * Makefile.cfg (local_updates, executable-update): Tweak to be diff --git a/THANKS b/THANKS index 93b13bf3..35e5ce70 100644 --- a/THANKS +++ b/THANKS @@ -181,8 +181,9 @@ Scott Stanton stanton@scriptics.com Simon Leinen simon@lia.di.epfl.ch Stephen Gildea filtered@against.spam Steve Chamberlain sac@cygnus.com -Steven G. Johnson stevenj@alum.mit.edu +Steve Huston shuston@riverace.com Steve Robbins steve@nyongwa.montreal.qc.ca +Steven G. Johnson stevenj@alum.mit.edu Stu Grossman grossman@cygnus.com Syd Polk spolk@cygnus.com T.E. Dickey dickey@clark.net diff --git a/bin/autom4te.in b/bin/autom4te.in index 664c7cd4..b9386c4f 100644 --- a/bin/autom4te.in +++ b/bin/autom4te.in @@ -992,10 +992,11 @@ handle_m4 ($req, keys %{$req->macro}) if $force || ! $req->valid; # Issue the warnings each time autom4te was run. +my $separator = "\n" . ('-' x 25) . " END OF WARNING " . ('-' x 25) . "\n\n"; handle_traces ($req, "$tmp/warnings", - ('_m4_warn' => "\$1::\$f:\$l::\$2::\$3\n\n")); -# Warnings are separated by 2 \n. -for (split (/\n{2,}/, contents ("$tmp/warnings"))) + ('_m4_warn' => "\$1::\$f:\$l::\$2::\$3$separator")); +# Swallow excessive newlines. +for (split (/\n*$separator\n*/o, contents ("$tmp/warnings"))) { # The message looks like: # | syntax::input.as:5::ouch -- 2.47.2