Syntax: expand &$... to ${....} rather than $(....)

[subdirmk.git] / generate

diff --git a/generate b/generate
index 61bbd507c683adc89d5fe648260737a7c0492e73..ffd3e5dfdb1e18951ac9771efef71c93e3e64143 100755 (executable)
--- a/generate
+++ b/generate
@@ -177,6 +177,7 @@ our @warn_ena_dfl = map { $_ => 1 } qw(
     local+global
     single-char-var
     unknown-warning
+    broken-var-ref
 );
 our %warn_ena = @warn_ena_dfl;
 
@@ -198,6 +199,8 @@ sub wrncore ($$) {
 
 sub wrn ($$) {
     my ($wk,$m) = @_;
+    our %warn_dedupe;
+    return 0 if $warn_dedupe{$err_file,$.,$wk,$m}++;
     wrncore($wk, "${err_file}:$.: $m");
 }
 
@@ -330,6 +333,10 @@ sub process_input_mk ($$$$) {
                    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);
@@ -343,7 +350,7 @@ sub process_input_mk ($$$$) {
            elsif (m{^(?=$caps_re)}) { od $var_prefix }
            elsif (s{^\$([A-Za-z]\w+)}{}) {
                $note_varref->($1,1);
-               od "\$(${var_prefix}$1)";
+               od "\${${var_prefix}$1}";
            }
            elsif (s{^([~^]?)(?=$lc_re)}{}) { od $pfxmap{$1} }
            elsif (s{^_}{}) { od $var_prefix }