X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=generate;h=f5c416db226dd22b1c2b7e434c09f3516fc1b2b2;hp=209a1f3e6a1f19f04593cf46ff60bab84172d23e;hb=e36c3e76d81cd2dc6d157234bc60b6c9bd156e0d;hpb=20e5ccd063565c2207066d4ed3b48be49143194b

diff --git a/generate b/generate
index 209a1f3..f5c416d 100755
--- a/generate
+++ b/generate
@@ -7,7 +7,7 @@
 # $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
 #
 # generates in each subdirectory
-#     Subdir.mk.tmp
+#     Dir.mk.tmp
 #     Makefile
 # and in toplevel
 #     main.mk.tmp
@@ -216,6 +216,7 @@ sub process_input_mk ($$$$) {
 
     local $ddbl;
     my @nest = (['']);
+    my $evalcall_brackets;
 
     my $push_nest = sub {
 	my ($nk, $nndbl, $what) = @_;
@@ -235,13 +236,13 @@ 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_]*)#) {
-	    err "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);
@@ -250,17 +251,19 @@ sub process_input_mk ($$$$) {
 	for (;;) {
 	    err 'cannot $-double &-processed RHS of directive'
 		if $ddbl && defined $buffering_output;
-	    unless ($nest[0][0] eq 'Eval'
+	    unless ($nest[0][0] eq 'eval'
 		    ? s{^(.*?)($esc|[{}])}{}
 		    : s{^(.*?)($esc)}{}) { od $_; last; }
 	    od $1;
 	    if ($2 eq '{') {
-		$ddbl++;
+		od $2;
+		$evalcall_brackets++;
 		next;
 	    } elsif ($2 eq '}') {
-		next if --$ddbl;
-		$pop_nest->('Eval');
-		od '}}';
+		od $2;
+		next if --$evalcall_brackets;
+		$pop_nest->('eval');
+		od '}';
 		next;
 	    }
 	    if (s{^\\$esc}{}) { od "$$esclitr" }
@@ -282,7 +285,8 @@ sub process_input_mk ($$$$) {
 	    elsif (s{^\$\{}{}) {
 		err 'macro invocation cannot be re-$-doubled' if $ddbl;
 		od '${eval ${call ';
-		$push_nest->('Eval',1, '&${...}');
+		$evalcall_brackets = 1;
+		$push_nest->('eval',1, '&${...}');
 	    } elsif (s{^([~^]?)(?=[ \t])}{}) {
 		my $prefix = $pfxmap{$1} // die "internal error ($1?)";
 		my $after='';
@@ -296,7 +300,8 @@ sub process_input_mk ($$$$) {
 		od $_;
 		$_ = '';
 	    } else {
-		err "bad &-escape \`$$esclitr$_'";
+		m{^.{0,5}};
+		err "bad &-escape \`$$esclitr$&'";
 	    }
 	}
 	if (defined $buffering_output) {
@@ -308,9 +313,9 @@ 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 ($_?)";
+		err "bad directive argument syntax";
 	    }
 	}
     }
@@ -332,9 +337,9 @@ sub filter_subdir_mk ($) {
 	my ($f, $enoentok) = @_;
 	process_input_mk($targets, "${srcdir}/$f", \$esclit, $enoentok);
     };
-    $pi->("Prefix.sd.mk",              1);
-    $pi->("${dir_prefix}Subdir.sd.mk", 0);
-    $pi->("Suffix.sd.mk",              1);
+    $pi->("Prefix.sd.mk",           1);
+    $pi->("${dir_prefix}Dir.sd.mk", 0);
+    $pi->("Suffix.sd.mk",           1);
 }
 
 sub process_subtree ($$);
@@ -350,7 +355,7 @@ sub process_subtree ($$) {
     # ^ this is the only var which we need before we come back from
     #   the recursion.
 
-    push @output_makefiles, "${dir_prefix}Subdir.mk";
+    push @output_makefiles, "${dir_prefix}Dir.mk";
     write_makefile($dir_prefix, scalar @$path);
 
     my %targets = (all => []);
@@ -363,12 +368,12 @@ sub process_subtree ($$) {
     }
 
     set_dir_vars($path);
-    start_output_file("${dir_prefix}Subdir.mk.tmp");
+    start_output_file("${dir_prefix}Dir.mk.tmp");
 
     if ($node->[2]) {
 	filter_subdir_mk(\%targets);
     } else {
-	my $sdmk = "${dir_prefix}Subdir.sd.mk";
+	my $sdmk = "${dir_prefix}Dir.sd.mk";
 	if (stat $sdmk) {
 	    die
  "subdirmk: $sdmk unexpectedly exists (${dir_prefix} not mentioned on subdirmk/generate command line, maybe directory is missing from SUBDIRMK_SUBDIRS)";
@@ -383,16 +388,16 @@ sub process_subtree ($$) {
     my @targets = sort keys %targets;
     foreach my $target (@targets) {
 	my $target_varname = target_varname($var_prefix, $target);
-	print O "${dir_prefix}${target}:: \$($target_varname)";
+	oraw "${dir_prefix}${target}:: \$($target_varname)";
 	foreach my $child_subdir (@{ $targets{$target} }) {
-	    print O " $child_subdir/$target";
+	    oraw " $child_subdir/$target";
 	}
-	print O "\n";
+	oraw "\n";
     }
     if (@targets) {
-	print O ".PHONY:";
-	print O " ${dir_prefix}${_}" foreach @targets;
-	print O "\n";
+	oraw ".PHONY:";
+	oraw " ${dir_prefix}${_}" foreach @targets;
+	oraw "\n";
     }
 
     return @targets;