X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=generate;h=4a0450686c61e556227a1134bef5f3d114b7b277;hp=3ccfa0dd090673a2f4a04d1bd799450a191fd025;hb=ecbc3dad2da6cddc7562ce77807231d995f6353a;hpb=3177fb7abb48479332cce56b02b6407968fb2d27

diff --git a/generate b/generate
index 3ccfa0d..4a04506 100755
--- a/generate
+++ b/generate
@@ -19,13 +19,32 @@ print "$0 @ARGV\n" or die $!;
 
 our $srcdir='.';
 
+# error handling methods:
+#
+# Error in input file, while $err_file and $. set, eg in most of
+# process_input_mk:
+#         err "message";
+#
+# Other input or usage errors:
+#         die "subdirmk: $file:$lno: problem\n";
+#         die "subdirmk: some problem not locatable in that way\n";
+#
+# Usage error:
+#         die "subdirmk $0: explanation of problem\n";
+#
+# System call error (not ENOENT) accessing input/output files:
+#         die "description of problem eg maybe erbing noun: $!\n";
+#
+# Bug detedcted in `generate':
+#         die "internal error (some information)?"; # or similar
+
 while (@ARGV && $ARGV[0] =~ m/^-/) {
     $_ = shift @ARGV;
     last if $_ eq '--';
     if (s/^--srcdir=//) {
 	$srcdir=$';
     } else {
-	die "$0: unknown option \`$_'\n";
+	die "subdirmk $0: unknown option \`$_'\n";
     }
 }
 our @subdirs = @ARGV;
@@ -70,7 +89,7 @@ sub close_any_output_file() {
 }
 
 sub oraw {
-    die unless defined $writing_output;
+    die 'internal error' unless defined $writing_output;
     print O @_ or die "error writing $writing_output.tmp: $!\n";
 }
 
@@ -99,7 +118,8 @@ sub od { # maybe $-doubled
 sub start_output_file ($) {
     close_any_output_file();
     ($writing_output) = @_;
-    die "$writing_output ?" if $output_files{$writing_output}++;
+    die "internal error ($writing_output?)"
+	if $output_files{$writing_output}++;
     my $tmp = "$writing_output.tmp";
     open O, ">", $tmp or die "create $tmp: $!\n";
     oraw "# autogenerated - do not edit\n";
@@ -149,6 +169,19 @@ sub set_dir_vars ($) {
     $var_prefix = "${var_prefix_name}_";
 }
 
+our $err_file;
+
+sub err ($) {
+    my ($m) = @_;
+    die "subdirmk: ${err_file}:$.: $m\n";
+}
+
+sub ddbl_only ($) {
+    my ($e) = @_;
+    return if $ddbl;
+    err "escape &$e is valid only during \$-doubling";
+}
+
 sub process_input_mk ($$$$);
 sub process_input_mk ($$$$) {
     my ($targets, $f, $esclitr, $enoent_ok) = @_;
@@ -165,11 +198,13 @@ sub process_input_mk ($$$$) {
 
     my $input = new IO::File $f, '<';
     if (!$input) {
-	die "open $f: $!\n" unless $!==ENOENT && $enoent_ok;
+	err "open $f: $!" unless $!==ENOENT && $enoent_ok;
 	return;
     }
     $input_files{$f}++;
 
+    local $err_file=$f;
+
     my %srcdirmap = (
 		  '^' => "\$(top_srcdir)${dir_suffix}",
 		  '~' => "\$(top_srcdir)",
@@ -180,16 +215,17 @@ sub process_input_mk ($$$$) {
     $pfxmap{$_} = $srcdirmap{$_}.'/' foreach keys %srcdirmap;
 
     local $ddbl;
-    my @nest;
+    my @nest = (['']);
 
     my $push_nest = sub {
-	my ($nk, $nndbl) = @_;
-	unshift @nest, [ $nk, $ddbl ];
+	my ($nk, $nndbl, $what) = @_;
+	unshift @nest, [ $nk, $ddbl, $what, $. ];
 	$ddbl = $nndbl;
     };
     my $pop_nest = sub {
 	my ($nk) = @_;
-	die unless $nest[0][0] eq $nk;
+	err "unexpectedly closed $nk in middle of $nest[0][0] ($nest[0][2])"
+	    unless $nest[0][0] eq $nk;
 	$ddbl = (shift @nest)[1];
     };
 
@@ -199,22 +235,34 @@ sub process_input_mk ($$$$) {
 	    $set_esc->();
 	    next;
 	} elsif (s#^\s*$esc\:endm\s+$##) {
-	    $pop_nest->('Macro');
+	    $pop_nest->('macro');
 	    od "endef\n";
 	    next;
 	} elsif (s#^\s*$esc\:(?=(-?)include|macro)##) {
 	    $buffering_output='';
 	} elsif (m#^\s*$esc\:([a-z][-0-9a-z_]*)#) {
-	    die "unknown directive $1";
+	    err "unknown directive &:$1 or bad argumnt syntax";
 	} elsif (s{^\s*${esc}TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
 	    my $t = $1 // 'all';
 	    od target_varname($var_prefix, $t);
 	    $targets->{$t} //= [ ];
 	}
 	for (;;) {
-	    die if $ddbl && defined $buffering_output;
-	    unless (s{^(.*?)$esc}{}) { od $_; last; }
+	    err 'cannot $-double &-processed RHS of directive'
+		if $ddbl && defined $buffering_output;
+	    unless ($nest[0][0] eq 'eval'
+		    ? s{^(.*?)($esc|[{}])}{}
+		    : s{^(.*?)($esc)}{}) { od $_; last; }
 	    od $1;
+	    if ($2 eq '{') {
+		$ddbl++;
+		next;
+	    } elsif ($2 eq '}') {
+		next if --$ddbl;
+		$pop_nest->('eval');
+		od '}}';
+		next;
+	    }
 	    if (s{^\\$esc}{}) { od "$$esclitr" }
 	    elsif (s{^\\\$}{}) { oud '$' }
 	    elsif (s{^\\\s+$}{}) { }
@@ -229,10 +277,14 @@ sub process_input_mk ($$$$) {
 	    elsif (s{^([~^])\.}{}) { od $srcdirmap{$1} }
 	    elsif (s{^\$\-}{}) { $ddbl=undef; }
 	    elsif (s{^\$\+}{}) { $ddbl=1; }
-	    elsif (s{^\$\(}{}) { die unless $ddbl; oud "\$("; }
-	    elsif (s{^\$(\d+)}{}) { die unless $ddbl; oud "\$($1)"; }
-	    elsif (s{^([~^]?)(?=[ \t])}{}) {
-		my $prefix = $pfxmap{$1} // die;
+	    elsif (s{^\$\(}{}) { ddbl_only($&); oud "\$("; }
+	    elsif (s{^\$(\d+)}{}) { ddbl_only($&); oud "\$($1)"; }
+	    elsif (s{^\$\{}{}) {
+		err 'macro invocation cannot be re-$-doubled' if $ddbl;
+		od '${eval ${call ';
+		$push_nest->('eval',1, '&${...}');
+	    } elsif (s{^([~^]?)(?=[ \t])}{}) {
+		my $prefix = $pfxmap{$1} // die "internal error ($1?)";
 		my $after='';
 		if (m{([ \t])$esc}) { ($_,$after) = ($`, $1.$'); }
 		s{(?<=[ \t])(?=\S)(?!\\\s*$)}{$prefix}g;
@@ -244,7 +296,8 @@ sub process_input_mk ($$$$) {
 		od $_;
 		$_ = '';
 	    } else {
-		die "bad escape $$esclitr$_ ";
+		m{^.{0,5}};
+		err "bad &-escape \`$$esclitr$&'";
 	    }
 	}
 	if (defined $buffering_output) {
@@ -256,12 +309,14 @@ sub process_input_mk ($$$$) {
 		od "\n";
 	    } elsif (m#^macro\s+(\S+)\s+$#) {
 		od "define $1\n";
-		$push_nest->('Macro', 1);
+		$push_nest->('macro', 1, '&:macro');
 	    } else {
-		die "internal error buffering directive $_ ";
+		err "bad directive argument syntax";
 	    }
 	}
     }
+    die "subdirmk: $f:$nest[0][3]: unclosed $nest[0][0] ($nest[0][2])\n"
+	if $nest[0][0];
     $input->error and die "read $f: $!\n";
     close $input or die "close $f: $!\n";
 }
@@ -303,7 +358,7 @@ sub process_subtree ($$) {
     foreach my $child (@{ $node->[1] }) {
 	my @childpath = (@$path, $child->[0]);
 	my $child_subdir = join '/', @childpath;
-	mkdir $child_subdir or $!==EEXIST or die "mkdir $child_subdir: $!";
+	mkdir $child_subdir or $!==EEXIST or die "mkdir $child_subdir: $!\n";
 	push @{ $targets{$_} }, $child_subdir foreach
 	    process_subtree($child, \@childpath);
     }
@@ -316,10 +371,11 @@ sub process_subtree ($$) {
     } else {
 	my $sdmk = "${dir_prefix}Subdir.sd.mk";
 	if (stat $sdmk) {
-	    die "$sdmk unexpectedly exists (${dir_prefix} not mentioned)";
+	    die
+ "subdirmk: $sdmk unexpectedly exists (${dir_prefix} not mentioned on subdirmk/generate command line, maybe directory is missing from SUBDIRMK_SUBDIRS)";
 	} elsif ($!==ENOENT) {
 	} else {
-	    die "stat $sdmk: $!";
+	    die "stat $sdmk: $!\n";
 	}
     }
 
@@ -353,7 +409,8 @@ sub process_final ($) {
     process_input_mk(\%ntargets, "${srcdir}/Final.sd.mk", \$esclit, 1);
     delete $ntargets{$_} foreach @$otargets;
     my @ntargets = sort keys %ntargets;
-    die "late new targets @ntargets" if @ntargets;
+    die "subdirmk: Final.sd.mk may not introduce new top-level targets".
+	" (@ntargets)\n" if @ntargets;
 }
 
 sub process_tree() {