X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=generate;h=4bc1e74eb712a3a799bb9ee19912189d58b91e08;hp=66919df2b633452c7767178f517d59b216860053;hb=57a9bee6bf459a1499729159007bfd95110b94e2;hpb=963054a07f6670d984c3e69280bde4832ca837d6

diff --git a/generate b/generate
index 66919df..4bc1e74 100755
--- a/generate
+++ b/generate
@@ -69,13 +69,31 @@ sub close_any_output_file() {
     $writing_output = undef;
 }
 
-sub o {
+sub oraw {
+    die unless defined $writing_output;
+    print O @_ or die "error writing $writing_output.tmp: $!\n";
+}
+
+sub oud { # undoubled
     if (defined $buffering_output) {
 	$buffering_output .= $_ foreach @_;
 	return;
     }
-    die unless defined $writing_output;
-    print O @_ or die "error writing $writing_output.tmp: $!\n";
+    oraw @_;
+}
+
+our $ddbl;
+
+sub od { # maybe $-doubled
+    if (!$ddbl) {
+	oud @_;
+	return;
+    }
+    foreach (@_) {
+	my $e = $_;
+	$e =~ s{\$}{\$\$}g;
+	oud $e;
+    }
 }
 
 sub start_output_file ($) {
@@ -84,7 +102,7 @@ sub start_output_file ($) {
     die "$writing_output ?" if $output_files{$writing_output}++;
     my $tmp = "$writing_output.tmp";
     open O, ">", $tmp or die "create $tmp: $!\n";
-    o "# autogenerated - do not edit\n";
+    oraw "# autogenerated - do not edit\n";
 }
 
 sub install_output_files () {
@@ -102,7 +120,7 @@ sub write_makefile ($$) {
     my $suppress_templates=
 	'$(if $(filter-out clean real-clean, $(subdirmk_targets)),,'.
 	' MAKEFILE_TEMPLATES=)';
-    o <<END;
+    oraw <<END;
 default: all
 \$(filter-out all,\$(MAKECMDGOALS)) all: run-main.mk
 	\@:
@@ -161,46 +179,84 @@ sub process_input_mk ($$$$) {
 		 );
     $pfxmap{$_} = $srcdirmap{$_}.'/' foreach keys %srcdirmap;
 
+    local $ddbl;
+    my @nest = (['']);
+
+    my $push_nest = sub {
+	my ($nk, $nndbl) = @_;
+	unshift @nest, [ $nk, $ddbl ];
+	$ddbl = $nndbl;
+    };
+    my $pop_nest = sub {
+	my ($nk) = @_;
+	die unless $nest[0][0] eq $nk;
+	$ddbl = (shift @nest)[1];
+    };
+
     while (<$input>) {
 	if (s#^\s*$esc\:changequote\s+(\S+)\s+$##) {
 	    $$esclitr = $1;
 	    $set_esc->();
 	    next;
-	} elsif (s#^\s*$esc\:(?=(-?)include)##) {
+	} elsif (s#^\s*$esc\:endm\s+$##) {
+	    $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";
 	} elsif (s{^\s*${esc}TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
 	    my $t = $1 // 'all';
-	    o target_varname($var_prefix, $t);
+	    od target_varname($var_prefix, $t);
 	    $targets->{$t} //= [ ];
 	}
 	for (;;) {
-	    unless (s{^(.*?)$esc}{}) { o $_; last; }
-	    o $1;
-	    if (s{^\\$esc}{}) { o "$$esclitr" }
-	    elsif (s{^\\\$}{}) { o '$' }
+	    die 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+$}{}) { }
-	    elsif (s{^$esc}{}) { o "$$esclitr$$esclitr" }
-	    elsif (m{^(?=$caps_re)}) { o $var_prefix }
-	    elsif (s{^\$([A-Za-z]\w+)}{}) { o "\$(${var_prefix}$1)" }
-	    elsif (s{^([~^]?)(?=$lc_re)}{}) { o $pfxmap{$1} }
-	    elsif (s{^_}{}) { o $var_prefix }
-	    elsif (s{^=}{}) { o $var_prefix_name }
-	    elsif (s{^([~^]?)/}{}) { o $pfxmap{$1} }
-	    elsif (s{^\.}{}) { o $dir_name }
-	    elsif (s{^([~^])\.}{}) { o $srcdirmap{$1} }
-	    elsif (s{^([~^]?)(?=[ \t])}{}) {
+	    elsif (s{^$esc}{}) { od "$$esclitr$$esclitr" }
+	    elsif (m{^(?=$caps_re)}) { od $var_prefix }
+	    elsif (s{^\$([A-Za-z]\w+)}{}) { od "\$(${var_prefix}$1)" }
+	    elsif (s{^([~^]?)(?=$lc_re)}{}) { od $pfxmap{$1} }
+	    elsif (s{^_}{}) { od $var_prefix }
+	    elsif (s{^=}{}) { od $var_prefix_name }
+	    elsif (s{^([~^]?)/}{}) { od $pfxmap{$1} }
+	    elsif (s{^\.}{}) { od $dir_name }
+	    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{^\$\{}{}) {
+		die if $ddbl;
+		od '${eval ${call ';
+		$push_nest->('Eval',1);
+	    } elsif (s{^([~^]?)(?=[ \t])}{}) {
 		my $prefix = $pfxmap{$1} // die;
 		my $after='';
 		if (m{([ \t])$esc}) { ($_,$after) = ($`, $1.$'); }
 		s{(?<=[ \t])(?=\S)(?!\\\s*$)}{$prefix}g;
-		o $_;
+		od $_;
 		$_ = $after;
 	    } elsif (s{^\#}{}) {
 		$_ = '';
 	    } elsif (s{^![ \t]+}{}) {
-		o $_;
+		od $_;
 		$_ = '';
 	    } else {
 		die "bad escape $$esclitr$_ ";
@@ -212,12 +268,16 @@ sub process_input_mk ($$$$) {
 	    if (m#^(-?)include\s+(\S+)\s+$#) {
 		my $subf = "$srcdir/$2";
 		process_input_mk($targets, $subf, $esclitr, $1);
-		o "\n";
+		od "\n";
+	    } elsif (m#^macro\s+(\S+)\s+$#) {
+		od "define $1\n";
+		$push_nest->('Macro', 1);
 	    } else {
 		die "internal error buffering directive $_ ";
 	    }
 	}
     }
+    die "unclosed $nest[0][0]" if $nest[0][0];
     $input->error and die "read $f: $!\n";
     close $input or die "close $f: $!\n";
 }
@@ -279,7 +339,7 @@ sub process_subtree ($$) {
 	}
     }
 
-    o "\n";
+    oraw "\n";
 
     my @targets = sort keys %targets;
     foreach my $target (@targets) {
@@ -317,17 +377,17 @@ sub process_tree() {
     process_final(\@targets);
     start_output_file("main.mk.tmp");
     foreach my $v (qw(top_srcdir abs_top_srcdir)) {
-	o "$v=\@$v@\n";
+	oraw "$v=\@$v@\n";
     }
-    o "SUBDIRMK_MAKEFILES :=\n";
-    o "MAKEFILE_TEMPLATES :=\n";
+    oraw "SUBDIRMK_MAKEFILES :=\n";
+    oraw "MAKEFILE_TEMPLATES :=\n";
     foreach my $mf (@output_makefiles) {
-	o "SUBDIRMK_MAKEFILES += $mf\n";
+	oraw "SUBDIRMK_MAKEFILES += $mf\n";
     }
     foreach my $input (sort keys %input_files) {
-	o "MAKEFILE_TEMPLATES += $input\n";
+	oraw "MAKEFILE_TEMPLATES += $input\n";
     }
-    o "include \$(SUBDIRMK_MAKEFILES)\n";
+    oraw "include \$(SUBDIRMK_MAKEFILES)\n";
 }
 
 build_tree();