X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=generate;h=747a79b8441a740dedeb641886849111c5077c27;hb=25f6a903cdc66a97dd3d2092aafe16800c450a53;hp=62e915fb35df1065f466a1c25b5f4312b52bc726;hpb=70fe981f4fa66e0590f867519d5cb02c3a31dbf4;p=subdirmk.git

diff --git a/generate b/generate
index 62e915f..747a79b 100755
--- a/generate
+++ b/generate
@@ -235,7 +235,7 @@ 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)##) {
@@ -250,7 +250,7 @@ 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;
@@ -259,7 +259,7 @@ sub process_input_mk ($$$$) {
 		next;
 	    } elsif ($2 eq '}') {
 		next if --$ddbl;
-		$pop_nest->('Eval');
+		$pop_nest->('eval');
 		od '}}';
 		next;
 	    }
@@ -282,7 +282,7 @@ sub process_input_mk ($$$$) {
 	    elsif (s{^\$\{}{}) {
 		err 'macro invocation cannot be re-$-doubled' if $ddbl;
 		od '${eval ${call ';
-		$push_nest->('Eval',1, '&${...}');
+		$push_nest->('eval',1, '&${...}');
 	    } elsif (s{^([~^]?)(?=[ \t])}{}) {
 		my $prefix = $pfxmap{$1} // die "internal error ($1?)";
 		my $after='';
@@ -309,7 +309,7 @@ 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 ($_?)";
 	    }