X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=generate;h=b65ba1de66ce0883a63f33dffe6548b88d37921e;hb=HEAD;hp=15e2235d68000c14306eeb477e215c27717cbc92;hpb=1b25048c9412df63208906cb00c3572647039c7a;p=subdirmk.git

diff --git a/generate b/generate
index 15e2235..b65ba1d 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...
 #
@@ -187,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 ($$) {
@@ -263,8 +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) = @_;
-	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>) {
@@ -347,6 +350,7 @@ sub process_input_mk ($$$$) {
 		next;
 	    }
 	    if (s{^\\$esc}{}) { od "$$esclitr" }
+	    elsif (s{^:}{}) { od "$$esclitr:" }
 	    elsif (s{^\\\$}{}) { oud '$' }
 	    elsif (s{^\\\s+$}{}) { }
 	    elsif (s{^$esc}{}) { od "$$esclitr$$esclitr" }
@@ -364,15 +368,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{^\(\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?)";
@@ -530,15 +536,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} };
 	}
+        }
     }
 }