Syntax: Support &:local+global !...

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

diff --git a/README b/README
index 415913b824bc423861bca18ce5d0821574dd4fbc..3d18dc28294f0f2dfe87062cd8ca4660b3cd2219 100644 (file)
--- a/README
+++ b/README
@@ -174,10 +174,11 @@ So pathname syntax is a subset of:
        by the final warning state after processing all the toplevel
        input files (including Final.sd.mk).
 
-&:local+global [&]VARIABLE ...
+&:local+global [!][&]VARIABLE ...
        Suppresses any warnings relating to forthcoming mentions
        to VARIABLE or &VARIABLE, as applicable.  Scope ends at
        the end of the current directory's Suffix.sd.mk.
+       Prefixing with ! removes [&]VARIABLE from the suppresion list.
 
 &:changequote NEWQUOTE
        changes the escape sequence from & to literally NEWQUOTE

diff --git a/generate b/generate
index 22789281b5e8b620cf8f2b843f5aab2e02b67308..15e2235d68000c14306eeb477e215c27717cbc92 100755 (executable)
--- a/generate
+++ b/generate
@@ -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)##) {

diff --git a/tests/filter/stderr.expected b/tests/filter/stderr.expected
index c23e275095bdd4fb6bb223583de6b15f1ec625a3..5d777c2c5c3bc4bcef98fc4bb1c6c74fef854c9f 100644 (file)
--- a/tests/filter/stderr.expected
+++ b/tests/filter/stderr.expected
@@ -13,4 +13,5 @@ subdirmk: warning (local+global): saw both WARN and &WARN
  saw &WARN at ./Dir.sd.mk:10
  saw &WARN at ./Dir.sd.mk:11
  saw &WARN at ./sub/dir/Dir.sd.mk:15
+ saw &WARN at ./sub/dir/Dir.sd.mk:24
 subdirmk: warning (unknown-warning): ./sub/dir/Dir.sd.mk:3: attempt to suppress unknown warning(s) `some-unknown-warning'

diff --git a/tests/filter/sub/dir/Dir.mk.expected b/tests/filter/sub/dir/Dir.mk.expected
index 9fe4f7594c2504e687eeff0c31e1088d086d3a07..627eaa53537a4f3c8c7f865f12956deb26c11043 100644 (file)
--- a/tests/filter/sub/dir/Dir.mk.expected
+++ b/tests/filter/sub/dir/Dir.mk.expected
@@ -18,6 +18,8 @@ WARN += 5
 
 $(NOWARN1)
 
+sub_dir_WARN += 6
+
 # doctests:
 # Suffix in sub/dir
 

diff --git a/tests/filter/sub/dir/Dir.sd.mk b/tests/filter/sub/dir/Dir.sd.mk
index bc974eae5950da76e065523d8e7b169993d8d006..c3603a0ea543fe976adcbc84a210b633d98bc1ec 100644 (file)
--- a/tests/filter/sub/dir/Dir.sd.mk
+++ b/tests/filter/sub/dir/Dir.sd.mk
@@ -20,5 +20,8 @@ WARN += 5
 
 $(NOWARN1)
 
+&:local+global !&WARN
+&WARN += 6
+
 # doctests:
 &:include &doctests.sd.mk