From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 26 Dec 2019 01:32:36 +0000 (+0000)
Subject: generate: Nested scope: Change `Macro' to `macro'
X-Git-Tag: subdirmk/0.3~52
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=commitdiff_plain;h=579c775ab875b89de0ecebad4eab8d8987e11a24

generate: Nested scope: Change `Macro' to `macro'

This is the nesting kind name.  But it also appears in error messages
where it ought not to be capitalised.

We'll change `Eval' in a moment.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/generate b/generate
index 62e915f..77469ac 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)##) {
@@ -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 ($_?)";
 	    }