Warnings: Introduce new `broken-var-ref' warning

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

diff --git a/README b/README
index a44fb492b47301ea3bbbef8c102c645c5e4c9f8c..e303788b362856eb0474c4b2618c49b35ee32288 100644 (file)
--- a/README
+++ b/README
@@ -336,6 +336,11 @@ suppressed with the &:warn directive.  The warning tags are:
        by more letters.  Note that &$FOO works differently to
        raw make: it expands to $(sub_dir_FOO).
 
        by more letters.  Note that &$FOO works differently to
        raw make: it expands to $(sub_dir_FOO).
 

+    broken-var-ref
+        An attempt at variable expansion looking like $&...
+       You probably expected this to mean $(TOP_F)BAR but it
+       expands to $TOP_FBAR which make thinks means $(T)OP_FBAR.
+

     unknown-warning
        &:warn was used to try to enable a warning that this version
        of subdirmk does not understand.  (Note that an attempt to
     unknown-warning
        &:warn was used to try to enable a warning that this version
        of subdirmk does not understand.  (Note that an attempt to

diff --git a/generate b/generate
index bae0995bef30dc90fbd19e7cb511d61a0887b99a..510612993f34fe82f8c6f60689d73552d5d7eeb6 100755 (executable)
--- a/generate
+++ b/generate
@@ -177,6 +177,7 @@ our @warn_ena_dfl = map { $_ => 1 } qw(
     local+global
     single-char-var
     unknown-warning
     local+global
     single-char-var
     unknown-warning

+    broken-var-ref

 );
 our %warn_ena = @warn_ena_dfl;
 
 );
 our %warn_ena = @warn_ena_dfl;
 


@@ -332,6 +333,10 @@ sub process_input_mk ($$$$) {
                    wrn 'single-char-var',
                    'possibly confusing unbracketed single-char $-expansion';
                }
                    wrn 'single-char-var',
                    'possibly confusing unbracketed single-char $-expansion';
                }

+               elsif (m{^$esc}) {
+                   wrn 'broken-var-ref',
+                   'broken $&... expansion; you probably meant &$';
+               }

                elsif (m{^\(($esc)?([^()\$]+)\)} ||
                       m{^\{($esc)?([^{}\$]+)\}}) {
                    $note_varref->($2,!!$1);
                elsif (m{^\(($esc)?([^()\$]+)\)} ||
                       m{^\{($esc)?([^{}\$]+)\}}) {
                    $note_varref->($2,!!$1);

diff --git a/tests/filter/Dir.mk.expected b/tests/filter/Dir.mk.expected
index 7eecb238dd9b05a69aa47d69581e0e0dc202c6ef..5205a3a85577554837adaeaf147a423951c1e958 100644 (file)
--- a/tests/filter/Dir.mk.expected
+++ b/tests/filter/Dir.mk.expected
@@ -17,6 +17,8 @@ TOP_WARN += 3
 
 ${eval ${call  some-macro, 42, $$x, {  $(foreach something) } }}
 
 
 ${eval ${call  some-macro, 42, $$x, {  $(foreach something) } }}
 

+$TOP_FBAR
+

 # doctests:
 # Suffix in .
 
 # doctests:
 # Suffix in .
 

diff --git a/tests/filter/Dir.sd.mk b/tests/filter/Dir.sd.mk
index 1a4eb1fed85ffec1153efc6e5961153eebc1838b..c97ee0f956260fbb347da9404e9837c81028c412 100644 (file)
--- a/tests/filter/Dir.sd.mk
+++ b/tests/filter/Dir.sd.mk
@@ -16,5 +16,7 @@ WARN += 3
 
 &${ some-macro, 42, $x, { &$- $(foreach something) } }
 
 
 &${ some-macro, 42, $x, { &$- $(foreach something) } }
 

+$&FBAR
+

 # doctests:
 &:include &doctests.sd.mk
 # doctests:
 &:include &doctests.sd.mk

diff --git a/tests/filter/stderr.expected b/tests/filter/stderr.expected
index fe8b3f26cdda9fc719ebfe841dc3c097a2253664..76e32ddece14a77d2d1a88c20796ebe68d2bca93 100644 (file)
--- a/tests/filter/stderr.expected
+++ b/tests/filter/stderr.expected
@@ -1,5 +1,6 @@
 subdirmk: warning (unknown-warning): ./Prefix.sd.mk:2: unknown warning many-requests-for-unknown-warning requested
 subdirmk: warning (single-char-var): ./Dir.sd.mk:8: possibly confusing unbracketed single-char $-expansion
 subdirmk: warning (unknown-warning): ./Prefix.sd.mk:2: unknown warning many-requests-for-unknown-warning requested
 subdirmk: warning (single-char-var): ./Dir.sd.mk:8: possibly confusing unbracketed single-char $-expansion

+subdirmk: warning (broken-var-ref): ./Dir.sd.mk:19: broken $&... expansion; you probably meant &$

 subdirmk: warning (local+global): saw both WARN and &WARN
  saw WARN at ./Dir.sd.mk:6
  saw WARN at ./Dir.sd.mk:9
 subdirmk: warning (local+global): saw both WARN and &WARN
  saw WARN at ./Dir.sd.mk:6
  saw WARN at ./Dir.sd.mk:9