The first commit is a scripted diff that corrects field ordering in a number of BIPs which are not consistent with the specified in BIP 2.
The second commit enforces that fields are ordered consistently with both BIP 2 and BIP 3. It does not strictly depend on #1820.
-BEGIN VERIFY SCRIPT-
set -e
perl <<'-END PERL-'
use strict;
use warnings;
my $topbip = 9999;
my @FieldOrder = qw(
BIP
Layer
Title
Author
Authors
Editor
Deputies
Discussions-To
Comments-Summary
Comments-URI
Status
Type
Created
License
License-Code
Discussion
Post-History
Version
Requires
Replaces
Proposed-Replacement
Superseded-By
);
my $bipnum = 0;
while (++$bipnum <= $topbip) {
my $fn = sprintf "bip-%04d.mediawiki", $bipnum;
my $is_markdown = 0;
if (!-e $fn) {
$fn = sprintf "bip-%04d.md", $bipnum;
$is_markdown = 1;
}
-e $fn || next;
open my $F, "<", $fn or die "$!";
my (@before, %preamble, @after);
if ($is_markdown) {
while (<$F>) {
push @before, $_;
last if m[^(?:\xef\xbb\xbf)?```$]
}
die "No ``` in $fn" if eof $F;
} else {
while (<$F>) {
push @before, $_;
last if m[^(?:\xef\xbb\xbf)?<pre>$];
}
die "No <pre> in $fn" if eof $F;
}
my %found;
my ($title, $author, $status, $type, $layer);
my ($field, $val, @field_order);
while (<$F>) {
push @after, $_ and last if ($is_markdown && m[^```$]);
push @after, $_ and last if (!$is_markdown && m[^</pre>$]);
if (m[^ ([\w-]+)\: (.*\S)$]) {
$field = $1;
$val = $2;
} elsif (m[^ ( +)(.*\S)$]) {
$val = $2;
} else {
die "Bad line in $fn preamble";
}
push @{$preamble{$field} ||= []}, $_;
}
push @after, <$F>;
close $F or die $!;
open my $W, ">", "$fn" or die "$!";
print $W @before;
print $W map { @$_ } grep { defined } delete @preamble{@FieldOrder};
die "Unknown fields: @{[ keys %preamble ]}" if %preamble;
print $W @after;
close $W or die $!;
}
-END PERL-
-END VERIFY SCRIPT-
The specified field order is consistent with both BIPs 2 and 3. The
ordering of fields which are only present in one or the other is
ambiguous, e.g. as in `Proposed-Replacement` and `Superseded-By` but
only one of these applies to a given BIP.
The `Editor` field is spurious, only being used in BIP 69, and appears
after Author.
205@@ -182,13 +206,18 @@
206 die "Unknown field $field in $fn";
207 }
208 ++$found{$field};
209+ push @field_order, $field if $field_order[-1] ne $field;
Running ./scripts/buildtable.pl on this branch, I am seeing the following messages on each iteration that were not present on master:
Use of uninitialized value in string ne at ./scripts/buildtable.pl line 209, <$F> line 2.
0$ ./scripts/buildtable.pl
1Use of uninitialized value in string ne at ./scripts/buildtable.pl line 209, <$F> line 2.
2|- style="background-color: #ffcfcf"
3| [[bip-0001.mediawiki|1]]
4|
5| BIP Purpose and Guidelines
6| Amir Taaki
7| Process
8| Replaced
9Use of uninitialized value in string ne at ./scripts/buildtable.pl line 209, <$F> line 2.
10|- style="background-color: #cfffcf"
11| [[bip-0002.mediawiki|2]]
12|
13| BIP process, revised
14| Luke Dashjr
15| Process
16| Active
17Use of uninitialized value in string ne at ./scripts/buildtable.pl line 209, <$F> line 2.
18|- style="background-color: #ffffcf"
19| [[bip-0003.md|3]]
20|
21| Updated BIP Process
22| Murch
23| Process
24| Proposed
25Use of uninitialized value in string ne at ./scripts/buildtable.pl line 209, <$F> line 2.
…/…
Labels
Process