generate: Mention suppressions when warning re VAR vs &VAR

[subdirmk.git] / generate

diff --git a/generate b/generate
index 22789281b5e8b620cf8f2b843f5aab2e02b67308..ad8c9eadecf8ae1df38183cdb8e010cd53fff865 100755 (executable)
--- a/generate
+++ b/generate
@@ -263,8 +263,8 @@ sub process_input_mk ($$$$) {
     # accurate, since it is only going to be used for advice to the user.
     my $note_varref = sub {
        my ($vn,$amp) = @_;
-       return if $varref_exp{$vn}{$amp};
-       $varref{$vn}{$amp}{"$f:$."} = 1;
+       my $exp = !!$varref_exp{$vn}{$amp};
+       $varref{$vn}{$exp}{$amp}{"$f:$."} = 1;
     };
 
     while (<$input>) {
@@ -296,8 +296,9 @@ sub process_input_mk ($$$$) {
            next;
        } elsif (s#^\s*$esc\:local\+global\s+(\S.*)$##) {
            foreach my $vn (split /\s+/, $1) {
+               my $pos = !($vn =~ s{^!}{});
                my $amp = $vn =~ s{^$esc}{};
-               $varref_exp{$vn}{!!$amp} = 1;
+               $varref_exp{$vn}{!!$amp} = $pos;
            }
            next;
        } elsif (s#^\s*$esc\:(?=(-?)include|macro)##) {
@@ -529,15 +530,20 @@ sub flmap ($) { local ($_) = @_; s{:(\d+)$}{ sprintf ":%10d", $1 }e; $_; }
 sub print_varref_warnings () {
     foreach my $vn (sort keys %varref) {
        my $vv = $varref{$vn};
-       next unless $vv->{''} && $vv->{1};
+       next unless $vv->{''}{''} && $vv->{''}{1};
        wrncore 'local+global', "saw both $vn and &$vn" or return;
+       foreach my $exp ('', 1) {
        foreach my $amp ('', 1) {
-           printf STDERR " saw %s%s at %s\n",
+           printf STDERR
+               ($exp
+                ? " expectedly saw %s%s at %s\n"
+                : " saw %s%s at %s\n"),
                ($amp ? '&' : ''), $vn, $_
                foreach
                sort { flmap($a) cmp flmap($b) }
-               keys %{ $vv->{$amp} };
+               keys %{ $vv->{$exp}{$amp} };
        }
+        }
     }
 }