Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

maint: clean up update-b4-copyright code

Browse Source 
* build-aux/update-b4-copyright: Do not accept 2-digit
UPDATE_COPYRIGHT_YEAR, which was not handled correctly.
Don't accept a `[' in a b4_copyright argument.
Format code more consistently.
Don't assume b4*copyright never occurs.
This commit is contained in:
Joel E. Denny
2009-08-05 19:52:41 -04:00
parent 269e222e24
commit 0b61a8ec18
2 changed files with 80 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2009-08-05 Joel E. Denny <jdenny@clemson.edu>
maint: clean up update-b4-copyright code
* build-aux/update-b4-copyright: Do not accept 2-digit
UPDATE_COPYRIGHT_YEAR, which was not handled correctly.
Don't accept a `[' in a b4_copyright argument.
Format code more consistently.
Don't assume b4*copyright never occurs.
2009-08-04 Joel E. Denny <jdenny@clemson.edu> 2009-08-04 Joel E. Denny <jdenny@clemson.edu>
maint: automate b4_copyright updates. maint: automate b4_copyright updates.

121
build-aux/update-b4-copyright
View File

@@ -1,5 +1,7 @@
#!/usr/bin/perl -0777 -pi #!/usr/bin/perl -0777 -pi
# Update an b4_copyright invocation to include the current year.
# Update b4_copyright invocations or b4_copyright_years definitions to
# include the current year.
# Copyright (C) 2009 Free Software Foundation, Inc. # Copyright (C) 2009 Free Software Foundation, Inc.
# #
@@ -19,20 +21,23 @@
use strict; use strict;
use warnings; use warnings;
my $margin = 72;
my $this_year = $ENV{UPDATE_COPYRIGHT_YEAR}; my $this_year = $ENV{UPDATE_COPYRIGHT_YEAR};
if (!$this_year || $this_year !~ m/^\d\d(\d\d)?$/) if (!$this_year || $this_year !~ m/^\d{4}$/)
{ {
my ($sec, $min, $hour, $mday, $month, $year) = localtime (time ()); my ($sec, $min, $hour, $mday, $month, $year) = localtime (time ());
$this_year = $year + 1900; $this_year = $year + 1900;
} }
my $margin = 72;
my $old_re = <<'EOF' my $old_re = <<'EOF'
( (
(?:^|\n) (?:^|\n)
#BEFORE
(?: (?:
b4_copyright\(\[[^]]*] b4_copyright\(\[[^][]*]
| m4_(?:push|pop)def\(\[b4_copyright_years] | m4_(?:push|pop)def\(\[b4_copyright_years]
) )
#AFTER
) )
(?: (?:
,\s* ,\s*
@@ -44,17 +49,15 @@ my $old_re = <<'EOF'
EOF EOF
; ;
while (/$old_re/x) while (/($old_re)/gx)
{ {
my $b4_copyright_line = $1; my $start = pos() - length ($1);
my $year_lines = $2; my $b4_copyright_line = $2;
my $sep = $3 ? $3 : ""; my $year_lines = $3;
my $final_year = $4; my $sep = $4 ? $4 : "";
my $final_year = $5;
$year_lines .= ')'; $year_lines .= ')';
# Mark it completed.
$b4_copyright_line =~ s/b4_/b4*/g;
# If there was a second argument, it contains years, so update them. # If there was a second argument, it contains years, so update them.
if ($final_year) if ($final_year)
{ {
@@ -76,49 +79,67 @@ while (/$old_re/x)
} }
} }
# Normalize all whitespace. # Normalize all whitespace.
$year_lines =~ s/\s+/ /g; $year_lines =~ s/\s+/ /g;
# Put spaces after commas. # Put spaces after commas.
$year_lines =~ s/, ?/, /g; $year_lines =~ s/, ?/, /g;
# Format within margin. # Format within margin.
my $year_lines_new; my $year_lines_new;
my $indent = index ($b4_copyright_line, '['); my $indent = index ($b4_copyright_line, '[');
--$indent if ($b4_copyright_line =~ m/^\n/); --$indent if ($b4_copyright_line =~ m/^\n/);
while (length $year_lines) while (length $year_lines)
{ {
my $text_margin = $margin - $indent; my $text_margin = $margin - $indent;
if (($year_lines =~ s/^(.{1,$text_margin})(?: |$)//) if (($year_lines =~ s/^(.{1,$text_margin})(?: |$)//)
|| ($year_lines =~ s/^([\S]+)(?: |$)//)) || ($year_lines =~ s/^([\S]+)(?: |$)//))
{ {
my $line = "\n" . (' 'x$indent) . $1; my $line = "\n" . (' 'x$indent) . $1;
++$indent if (!$year_lines_new); ++$indent if (!$year_lines_new);
$year_lines_new .= $line; $year_lines_new .= $line;
} }
else else
{ {
# Should be unreachable, but we don't want an infinite # Should be unreachable, but we don't want an infinite
# loop if it can be reached. # loop if it can be reached.
die; die;
} }
} }
$year_lines = $year_lines_new;
# Replace the old invocation. Should never die.
die if (!s/$old_re\G/$b4_copyright_line$year_lines_new/x);
# Prepare for the next search.
pos () = $start + length ("$b4_copyright_line$year_lines_new");
} }
# Replace the old invocation.
s/$old_re/$b4_copyright_line$year_lines/x;
} }
if (/\bb4_copyright\(/) while (/(\bb4_copyright\()/g)
{ {
print STDERR my $pos = pos ();
"$ARGV: warning: failed to update a b4_copyright invocation\n"; pos () -= length ($1);
} my $re = $old_re;
if (/\[b4_copyright_years]/) $re =~ s/\#BEFORE/\\G/;
{ if (!/$re/x)
print STDERR {
"$ARGV: warning: failed to update a b4_copyright_years use\n"; print STDERR
"$ARGV: warning: failed to update a b4_copyright before char"
. " $pos\n";
}
pos () = $pos;
} }
s/b4\*copyright/b4_copyright/g; while (/\[b4_copyright_years]/g)
{
my $pos = pos ();
my $re = $old_re;
$re =~ s/\#AFTER/\\G/;
if (!/$re/x)
{
print STDERR
"$ARGV: warning: failed to update a b4_copyright_years before"
. " char $pos\n";
}
pos () = $pos;
}