35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From: Jérémy Bobbio <lunar@debian.org>
|
|
Date: Wed, 8 Jul 2015 20:06:33 +0100
|
|
Subject: scripts/kernel-doc: parse kernel-doc deterministically
|
|
Bug-Debian: https://bugs.debian.org/769844
|
|
Forwarded: http://thread.gmane.org/gmane.linux.documentation/31870/focus=31871
|
|
|
|
Regular expressions for highlights in kernel-doc are stored in a Perl
|
|
hash. These hashes are ordered differently for each Perl run. This will
|
|
prevent kernel-doc to behave deterministically when parsing “@foo()” as
|
|
in some runs it will be interpreted as a parameter and in the others it
|
|
will be interpreted as a function.
|
|
|
|
We now sort the %highlights hash to get the same behavior on every run.
|
|
|
|
Signed-off-by: Jérémy Bobbio <lunar@debian.org>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
|
|
---
|
|
scripts/kernel-doc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
|
|
index 9922e66..71ada00 100755
|
|
--- a/scripts/kernel-doc
|
|
+++ b/scripts/kernel-doc
|
|
@@ -2587,7 +2587,7 @@ $kernelversion = get_kernel_version();
|
|
|
|
# generate a sequence of code that will splice in highlighting information
|
|
# using the s// operator.
|
|
-foreach my $pattern (keys %highlights) {
|
|
+foreach my $pattern (sort keys %highlights) {
|
|
# print STDERR "scanning pattern:$pattern, highlight:($highlights{$pattern})\n";
|
|
$dohighlight .= "\$contents =~ s:$pattern:$highlights{$pattern}:gs;\n";
|
|
}
|