X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=generate;h=b564260dea4c02e4385fc0b36974e04efbddf718;hp=510612993f34fe82f8c6f60689d73552d5d7eeb6;hb=2c8db0f89fdcb949f0e8f82a223bca194a7a28c8;hpb=40c6be70076365e0bc2b69e4368b7338a2e452a8

diff --git a/generate b/generate
index 5106129..b564260 100755
--- a/generate
+++ b/generate
@@ -3,6 +3,7 @@
 # subdirmk - &-filter (makefile generation program)
 #  Copyright 2019 Ian Jackson
 # SPDX-License-Identifier: LGPL-2.0-or-later
+# There is NO WARRANTY.
 #
 # $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
 #
@@ -153,6 +154,7 @@ END
 }
 
 our %varref;
+our %varref_exp;
 
 our ($dir_prefix, $dir_suffix, $dir_name,
      $var_prefix, $var_prefix_name);
@@ -186,7 +188,9 @@ our %warn_unk;
 
 sub err ($) {
     my ($m) = @_;
-    die "subdirmk: ${err_file}:$.: $m\n";
+    die defined $err_file
+	? "subdirmk: ${err_file}:$.: $m\n"
+	: "subdirmk: $m\n";
 }
 
 sub wrncore ($$) {
@@ -234,8 +238,8 @@ sub process_input_mk ($$$$) {
     local $err_file=$f;
 
     my %srcdirmap = (
-		  '^' => "\$(top_srcdir)${dir_suffix}",
-		  '~' => "\$(top_srcdir)",
+		  '^' => "\${top_srcdir}${dir_suffix}",
+		  '~' => "\${top_srcdir}",
 		    );
     my %pfxmap = (
 		  ''  => $dir_prefix,
@@ -262,7 +266,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) = @_;
-	$varref{$vn}{$amp}{"$f:$."} = 1;
+	my $exp = !!$varref_exp{$vn}{$amp};
+	$varref{$vn}{$exp}{$amp}{"$f:$."} = 1;
     };
 
     while (<$input>) {
@@ -294,8 +299,9 @@ sub process_input_mk ($$$$) {
 	    next;
 	} elsif (s#^\s*$esc\:local\+global\s+(\S.*)$##) {
 	    foreach my $vn (split /\s+/, $1) {
-		$vn =~ s{^$esc}{};
-		$varref{$vn}{NoWarn} = 1;
+		my $pos = !($vn =~ s{^!}{});
+		my $amp = $vn =~ s{^$esc}{};
+		$varref_exp{$vn}{!!$amp} = $pos;
 	    }
 	    next;
 	} elsif (s#^\s*$esc\:(?=(-?)include|macro)##) {
@@ -350,7 +356,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 }
@@ -361,15 +367,17 @@ sub process_input_mk ($$$$) {
 	    elsif (s{^\$\-}{}) { $ddbl=undef; }
 	    elsif (s{^\$\+}{}) { $ddbl=1; }
 	    elsif (s{^\$\(}{}) {
-		ddbl_only($&); oud "\$(";
+		ddbl_only($&); oud "\${";
 		$note_varref->($2,!!$1) if m{^($esc)?([^()\$]+\))};
 	    }
-	    elsif (s{^\$(\d+)}{}) { ddbl_only($&); oud "\$($1)"; }
-	    elsif (s{^\$\{}{}) {
+	    elsif (s{^\$(\d+)}{}) { ddbl_only($&); oud "\${$1}"; }
+	    elsif (s{^\(\s*$esc(?=$lc_re)}{}) { od "\$(call ${var_prefix}" }
+	    elsif (s{^\(\s*(?=\S)}{}        ) { od "\$(call "              }
+	    elsif (s{^\{}{}) {
 		err 'macro invocation cannot be re-$-doubled' if $ddbl;
 		od '${eval ${call ';
 		$evalcall_brackets = 1;
-		$push_nest->('eval',1, '&${...}');
+		$push_nest->('eval',1, '&{...}');
 		$note_varref->($2,!!$1) if m{^\s*($esc)?([^,{}\$]+)};
 	    } elsif (s{^([~^]?)(?=[ \t])}{}) {
 		my $prefix = $pfxmap{$1} // die "internal error ($1?)";
@@ -435,6 +443,8 @@ sub process_subtree ($$) {
     #use Data::Dumper;
     #print STDERR Dumper(\@_);
 
+    local %varref_exp;
+
     my $dir_prefix = dir_prefix($path);
     # ^ this is the only var which we need before we come back from
     #   the recursion.
@@ -525,16 +535,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 if $vv->{NoWarn};
+	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} };
 	}
+        }
     }
 }