From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 28 Dec 2019 12:52:01 +0000 (+0000)
Subject: Warnings: Sort occurrences properly in local+global warnings
X-Git-Tag: v0.6.0~249^2~29
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=a57defbff4c95ddb492dbd0c605611d11192dde5

Warnings: Sort occurrences properly in local+global warnings

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/generate b/generate
index c9ade62..1380918 100755
--- a/generate
+++ b/generate
@@ -474,6 +474,8 @@ sub process_tree() {
     oraw "include \$(SUBDIRMK_MAKEFILES)\n";
 }
 
+sub flmap ($) { local ($_) = @_; s{:(\d+)$}{ sprintf ":%10d", $1 }e; $_; }
+
 sub print_varref_warnings () {
     foreach my $vn (sort keys %varref) {
 	my $vv = $varref{$vn};
@@ -482,7 +484,9 @@ sub print_varref_warnings () {
 	foreach my $amp ('', 1) {
 	    printf STDERR " saw %s%s at %s\n",
 		($amp ? '&' : ''), $vn, $_
-		foreach sort keys %{ $vv->{$amp} };
+		foreach
+		sort { flmap($a) cmp flmap($b) }
+		keys %{ $vv->{$amp} };
 	}
     }
 }