chiark / gitweb /
generate: Nested scope: Change `Macro' to `macro'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 26 Dec 2019 01:32:36 +0000 (01:32 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 30 Dec 2019 11:35:15 +0000 (11:35 +0000)
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>
generate

index 62e915fb35df1065f466a1c25b5f4312b52bc726..77469ac9ec6e883a6a8233963e158e0a246fb096 100755 (executable)
--- 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 ($_?)";
            }